Changed user profile page
still working on infowindow styling
Merge branch 'master' into styling2
changed wording of adding markers
replaced show/back links with cancel