update by hp-mini
Merge branch 'develop' of github.com:do-something/start into develop

Conflicts:
	assets/app/core
update