setting up dev server
Merge branch 'master' of github.com:erstrong/p4

Conflicts:
	app/config/database.php
	app/routes.php
	app/storage/.gitignore
	app/storage/cache/.gitignore
	app/storage/logs/.gitignore
	app/storage/meta/.gitignore
	app/storage/sessions/.gitignore
	app/storage/views/.gitignore
	bootstrap/start.php