Merge Master with Development
Moved Database functionality to external class
Update Play to 2.2.0
Removed unneeded imports
Removed unused variable
Merge pull request #1 from Rhinofly/development

Development