Friends functionallity
Merge branch 'friends'

Conflicts:
	app/controllers/application_controller.rb
	app/views/layouts/application.html.erb
	app/views/pois/index.html.erb
	config/routes.rb
Added an Activity feed
Back to green