Add timestemp support
Some cleaning
Merge
Fix user insert
Merge
Cleaning up
Add Site resource
Merge remote-tracking branch 'origin/master' into feature/unified-routing

Conflicts:
	app/routes.php