Scan working, sensor configuration save.

Got Bluetooth scanning working, still need to work on connection code.
Sensor configurations can now be modified and saved to the device. Also
each sensor config can be deleted. Adding new sensors is currently
being worked on.
Fixed merge error with storyboard.