Initial start
Merge branch 'master' into feature/29/general-reports

Conflicts:
	Gemfile.lock
Lots of optimalisations
Add general reports
Spaceuhs
Merge pull request #35 from ZeusWPI/feature/29/general-reports

Feature/29/general reports