.
Merge branch 'master' into volix
Merge branch 'master' into volix
Invitations
Merge branch 'volix'

Conflicts:
	app/controllers/invitations_controller.rb
	db/schema.rb
Invitations
Merge branch 'master' of github.com:zarie/apka

Conflicts:
	db/schema.rb
Merge branch 'master' of github.com:zarie/apka

Conflicts:
	db/schema.rb