merge from editprofile to master

Version 0.less.ugly.1111111111111

1. overhaul the profile page
2. change User model 
3. change Campus, LS College, University requirement models 
4. illustrate how to use branching feature in git

5. if you are still reading this, get a life.