Add my location
Merge branch 'master' of github.com:ChamGeeks/GetAroundChamonix

Conflicts:
	www/css/style.min.css
	www/partials/select-area.html
Add my location button
Merge branch 'master' of github.com:ChamGeeks/GetAroundChamonix

Conflicts:
	www/css/style.min.css
	www/js/controllers.js
minified css