Whitespace removal
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
Merge branch 'develop' into 2.1
Update README.md
Merge remote-tracking branch 'origin/develop' into 2.1
Composer lock update
Updating lock file
Merge remote-tracking branch 'upstream/2.1' into 2.1

Conflicts:
	composer.lock
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