Bugfixes for some device/history/options stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	LDTDatastore/src/com/appengine/ldt/datastore/DatastoreAccess.java
	LDTDatastore/src/com/appengine/ldt/server/DatastoreServiceImpl.java
Merge branch 'master' of
https://github.com/CSE5236Group3/LDTDatastore.git

Conflicts:
	LDTDatastore/src/com/appengine/ldt/datastore/DatastoreAccess.java
	LDTDatastore/src/com/appengine/ldt/datastore/objects/Device.java