[+] invitation
[^] add username
Merge branch 'master' of github.com:volonterx/officelunch

Conflicts:
	app/controllers/application_controller.rb
	config/routes.rb