Merge branch 'master' into develop
Update composer.lock
Ignore misc files
Mode changes (remove executable)
Ignore desktop.ini
Add DJs table migration (and themes)
Add users table migration
Add news tables migration
Add news comment migration
Add failed logins migration
Add streamstatus migration
Add searchlog migration
Add tracks migration
Add API Keys migration
Missing semicolons
Merge pull request #18 from CrimsonVoid/develop

Missing semicolons
Remove php 5.4 from travis builds
Update composer lockfile
Add a git hook to automatically pull commits to master in
Merge branch 'develop'