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
Removed layout bug caused by error messages
Add tddium.yml config file for trying out Tddium CI
Update tddium yaml file: worker_setup must be a string
One last attempt to configure Tddium
Updated yml file with the latest texts
Made small adjustments to design (pay-off is smaller in smaller screenwidths)
Updated logo.png
Changed container-top placeholder color
Remove protocol from google fonts so they will also work on https
Add db role to capistrano production config

Then it will also run rake db:migrate
Hide invitation feedback when user is inviting another colleague
Fix for user registration and colleague invitation feedback and email texts