signup
fixed merge conflicts in controller.js
fixed merge conflicts with geolocation and new js files