Changed application layout
Pulled AccountControl latest
Added styles
Pulled latest master
Changed styles
Changed _header
Fixed conflicts in registration/edit.html file
Fixed layouts to address failing specs