training changes, some change main page
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	controllers/user.coffee
	public/js/app/user/core/viewHelpers.js
training changes, some change main page