Confict resolved
Merge branch 'master' of https://github.com/theodori/AndroidExperimentation

Conflicts:
	src/dynamix_framework/dynamix-framework/src/eu/smartsantander/androidExperimentation/operations/DynamixServiceListenerUtility.java