Modified views
Merge branch 'notes' into dev

Conflicts:
	app/views/devices/edit.html.erb
	app/views/devices/new.html.erb