try to resolve the error to be able to pull upstream master
no message
Merge branch 'master' of https://github.com/scothc/WhereIsFriend-app
set the enableHighAccuracy to true in the getCurrentPosition method
Added loging-page, implemented Login and New User buttons, added new-user-page
added logic for the Back button in new-user-page
added part of the logic for the Register button
Merge pull request #10 from jangelroa/master

new pages added