Adding Models for the database
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/models/User.php
	app/storage/.gitignore
	app/storage/cache/.gitignore
	app/storage/logs/.gitignore
	app/storage/meta/.gitignore
	app/storage/sessions/.gitignore
	app/storage/views/.gitignore