Fix acceptance test for spam protection in user registration form
Boyscout: fix capitalization for setInvitation
Implemented the lastest design
Fixed a merge bug - partial was not loaded due to wrong path
removed width bug
removed layout bug on small screens
Changed styling for small screens, removed padding
Use IP address for server instead of Amazon public DNS
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