database update
Merge remote-tracking branch 'origin/test_branch'

Conflicts:
	app/database/migrations/2014_04_16_113136_confide_setup_users_table.php