Allow different emails to be sent
Merge branch 'develop' into feature/allow_different_emails

# By Meliborn
# Via Keiran (4) and Meliborn (2)
* develop:
  Allow to add players via ajax form
  Allow to add players from group
  Manage groups and their players
  Get gmail contacts list

Conflicts:
	app/controllers/games_controller.rb
Trying to add mailers for different purposes
Think i have this working
Added players routes defaults
Merge branch 'develop' into feature/allow_different_emails

# By Keiran (6) and Meliborn (2)
* develop:
  group button move
  Allow to create group with game players
  Groups only if logged in. Removing gmail additions for now
  Test
  Reformatted to make things a bit prettier.
  Delete player from game added Dev env variable added DEV_SERVER
  Removed current_user present
  Moved gmail link to top of invite

Conflicts:
	app/views/games/show.html.haml
Fixed indentation error
Fixed bug on show page from merge
Manually updated the email text
Have to be signed in to send email
Merge branch 'feature/allow_different_emails' into develop
Sorted out where query with multiple parameters