Schedule finished. Starting to work on the exercise view.
Merge branch 'master' into dev-bluetoothsync
Bluetooth sync finished. Waiting for testing.
Merge branch 'master' into dev-bluetoothsync

Updating with latest changes.
Compatibility issues with the tehrapist app  solved.
Sync finished. Seems to be working fine in one direction. Do not touch too much
Improvements in the navigation
Exercise view and library interaction
Merge branch 'master' into merge

Conflicts:
	Boxlab-client/src/main/java/nl/boxlab/model/ExerciseNote.java
	Boxlab-client/src/main/java/nl/boxlab/model/Message.java
	Boxlab-client/src/main/java/nl/boxlab/model/nl/boxlab/model/ExerciseNote.java
Fixing merge
Temporary fix
Merge branch 'master' into dev-bluetoothsync
Fixing merge