File import
file import
Merge branch 'develop' of https://github.com/tulaseerao/neon into develop

Conflicts:
	app/models/device.rb
	db/schema.rb