Various local changes
Merge branch 'master' of github.com:almende/ReAAL-tools

Conflicts:
	management/src/main/java/com/almende/reaal/SenseClient.java
Added SenseAPI Scribe client