Merge origin/master

Conflicts:
	www/js/controllers.js
- Location is now retrieved form webservice: commented unneeded code for now.
- implemented code to submit the answers to the extra questions when making an appointment