Merge branch 'develop'
Fix: ignored useless IDEsync'd files
Merge branch 'develop'
Merge branch 'master' of github.com:Senorsen/SenorCMS
Merge branch 'master' into develop