Better behavior when clicking Cancel from edit mode

Direct to profile in all cases
Move user buttons out of avatar div, to improve sticky jerkiness
Merge branch 'master' of github.com:cuny-academic-commons/cac-advanced-profiles

Conflicts:
	assets/css/screen.css