InviteCollegue!!!
Merge branch 'master' into invite_collegues

Conflicts:
	app/assets/batman/controllers/users_controller.js.coffee
Fix acceptance test for spam protection in user registration form
Boyscout: fix capitalization for setInvitation
Colleague invitation with feedback
Merge branch 'master' into invite_collegues

Conflicts:
	app/assets/batman/html/users/form.html.erb
	app/assets/stylesheets/style.css.scss
Remove debugger from gemfile
Added styling to 'nodig collega uit' mail form
Updated overall styling
Invite colleagues gets its own controller
Merge branch 'invite_collegues'

Conflicts:
	app/assets/batman/html/users/new.html.erb