Add a migration to change all times in the database to integers
Update db schema
Merge branch 'master' into integers-for-times

Conflicts:
	db/schema.rb
Update db schema
Merge branch 'master' into integers-for-times
Remove Location.reset_date
Merge branch 'master' into integers-for-times

Conflicts:
	app/models/location.rb
Delete some reset_date calls that accidentally got added in a merge
Use Time.current instead of Time.now (it honors the current time zone properly)
Merge branch 'master' into integers-for-times

Conflicts:
	app/models/location.rb
Rename a test method
Add a test for Location.reset_date
Merge branch 'master' into integers-for-times
Fix the Location fixture so it uses integer values instead of Time values
Use the Numeric#hour method instead of an HOUR constant in the test fixtures
Fix some issues with methods and tests not working with the new integer times
Merge branch 'master' into bootstrap-3