Handle unlimited beta invitation for  admin users
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/BetaInvitations.java