Merge branch 'hotfix/issue-8' into develop
improved logo at very small sizes
Merge branch 'hotfix/issue-8-reopen' into develop
Add missing tmp directory to repo
Implement continuous integration using Travis-CI
Added PHP_CodeSniffer and implemented checks in build script
correct a path error in .travis.yml
Started cleaning up code
Additional code cleanup
Fix formatting of database file so it passes
Add tests for additional database types
Forgot to remove debugging line
Merge branch 'develop' into feature/validate-code-standard
Merge branch 'feature/validate-code-standard' into develop
transitioned to basic auth instead of acl
Clearing out old Role stuff
removed broken password change feature
Merge branch 'feature/simplify-permissions' into develop
Update documentation
Merge branch 'release/1.0-rc3'