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

Conflicts:

src/dynamix_framework/dynamix-framework/src/eu/smartsantander/androidExp
erimentation/operations/NotificationHQManager.java
first functional version of debug tab
Conflicts resolved