add account-settings
Minor fixes to account-settings
add account-settings
Minor fixes to account-settings
profile basics most done
Add basic settings
Merge branch 'account-settings'

Conflicts:
	app/assets/stylesheets/bootstrap_and_overrides.css