Add model and DAO for Location History
Merge branch 'master' of https://github.com/CMUPracticum/TrailScribe

Conflicts:
	TrailScribe/src/edu/cmu/sv/trailscribe/dao/DataSource.java