Fix some issues in the database seed caused by start/end times with nil values
Output docs to /doc/app instead of /doc
Merge branch 'master' into integers-for-times

Conflicts:
	app/models/location.rb