changes in controllersw
Merge remote-tracking branch 'origin/master'

Conflicts:
	views/partials/admin/templates/profile.jade