Work on default project structure.
Fix database path.
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	composer.json
	resources/database/migrations/2014_10_12_100000_create_password_resets_table.php
updating things