Merge branch 'master' of github.com:eliasson/quarterapp

Merge
Fixed indentation for pull request #44
Converted disabled in activity table to an tinyint
Merge pull request #45 from OlofFredriksson/master

Fixed indentation for pull request #44