Quick sync
Merge branch 'master' of https://github.com/WhatsNextLab/D-H

Conflicts:
	assets/.DS_Store