Added charts
reverted databse.yml
added cloud 9 ide db
Merge remote-tracking branch 'origin/neon_tulac' into develop

Conflicts:
	Gemfile
Added devices
updated excel
Added sample xlsx importer
Added sample xlsx importer
Updated export functionality
Added searching and sorting functionality
Added searching and sorting functionality
Updated devices and search functionality
Updated devices and search functionality
Commented Sidebar
added bootstrap pagination
added bootstrap
added search partial
added search partial
added search partial
Added login required