changes126
Merge branch 'master' of heroku.com:indebuurtarnhem
changes coomments
changes coomments
handleiding
deleted files
Merge branch 'master' of heroku.com:indebuurtarnhem

Conflicts:
	app/controllers/offers_controller.rb
	app/controllers/reactions_controller.rb
	app/models/offer.rb
	app/models/user.rb
	app/views/dashboard/index.html.erb
	app/views/events/index.html.erb
	app/views/offers/index.html.erb
	app/views/offers/show.html.erb
	app/views/reactions/_new.html.erb
	app/views/users/handleiding.html.erb
	app/views/users/location.html.erb
	poc/app/controllers/reactions_controller.rb
	poc/app/controllers/users_controller.rb
	poc/app/models/offer.rb
	poc/app/models/user.rb
	poc/app/views/offers/show.html.erb
	poc/app/views/reactions/_new.html.erb
	poc/app/views/users/handleiding.html.erb