CHanges
Merge branch 'master' of https://github.com/panpathfinder/pathfinder
Poll to get degree.
Merge branch 'master' of https://github.com/panpathfinder/pathfinder

Conflicts:
	mobile/www/js/controllers.js
Merge branch 'master' of https://github.com/panpathfinder/pathfinder
Location changes
Merge branch 'master' of https://github.com/panpathfinder/pathfinder

Conflicts:
	mobile/www/js/controllers.js
	mobile/www/templates/Map.html
Merge branch 'master' of https://github.com/panpathfinder/pathfinder