center on user
Merge branch 'faye' into development

Conflicts:
	Gemfile.lock
	app/assets/javascripts/application.js
	app/controllers/here_controller.rb
new styles were added
Merge branch 'development' of github.com:eagor/hereiam into development

Conflicts:
	app/assets/javascripts/application.js
	app/controllers/comment_controller.rb
	app/controllers/here_controller.rb
	app/views/home/_balloon.erb
javascript fixing
Merge branch 'development' of github.com:eagor/hereiam into development