+ setting location manually
Merge branch 'development' of github.com:eagor/hereiam into development

Conflicts:
	app/assets/javascripts/application.js