Do some update
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gruntfile.js
	dest/css/main.min.css
	dest/js/main.min.js
	src/js/app/controllers/DesktopController.js
	src/js/app/init/DesktopInit.js
	src/js/app/routers/AppRouter.js
	src/js/app/views/PublicRegisterActionView.js