fix conflicts
rebased with master and removed uncessary files
fix more conflicts
Profile is now a nested resource to User. Profile and Account are now different forms