Gemfile
added new models for location and device
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/dataSources.ids
	.idea/dataSources.xml
	.idea/workspace.xml
h
hhh
da
asdasdad