Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/assets/images/zmw_hs.jpg
#	src/assets/images/zmw_nd.jpg