so done with merging
Merge branch 'master' of http://github.com/wibbelsmac/otolith_senior

Conflicts:
	otolith/nrf51822/Board/pca10001/ble/otolith/arm/otolith.uvgui.travis
	otolith/nrf51822/Board/pca10001/ble/otolith/arm/otolith.uvopt