faye was implemented
Merge branch 'faye' of github.com:eagor/hereiam into faye

Conflicts:
	Gemfile.lock
	app/assets/javascripts/application.js
	app/controllers/here_controller.rb
	app/helpers/home_helper.rb
corrected ajax for creating 'Here'
Merge branch 'faye' into development