account page header
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/assets/less/custom.less