User profile settings backend completed. Added ellipsis to long child page titles on wiki.
Merge branch 'master' of github.com:EuropeanSpallationSource/AccESS

Conflicts:
	sites/all/themes/access/css/main.css
	sites/all/themes/access/sass/content/_user.scss