fix sql exception when adding a new token
Merge pull request #27 from Remo/date-used

fix sql exception when adding a new token
Update init.php
Update init.php
Update README.md
Remove .DS_Store files
Merge branch 'develop' into 2.1-noiselabs
Merge branch 'master' into 2.1-noiselabs

Conflicts:
	modules/UserModule/resources/sql/user-tables.sql
Merge branch '2.0' into 2.1-noiselabs

Conflicts:
	README.md
Use the new App::run() method in public/index.php
CS
changing app.yml references to app.php
adding in permissionDirs to the composer run-scripts to deal with app/logs and app/cache writable issues
Fixing up issues with Module::getName()
Cleaning up config files
Adding a return statement
Including datasoruce-module
Merge branch 'develop' into 2.1