tuesday merge
Merge branch 'master' into ryan

Conflicts:
	app/config/database.php
fix merge issue
Merge pull request #8 from 210geeks/ryan

Ryan