-- minor changes to android app - preparation to changing design
-- fixing android pom  - multiple class inclusion -- due to not mentioning version of the plugin in the poms
-- removing hadoop db -  not applicable
-- excluding osgi test bundle due to limitation of junit4osgi -- will add later proper testing
-- poms minor changes
Merge branch 'dev'

Conflicts:
	android/caao-android-app/pom.xml
	android/caao-android-appTest/lib/robotium-solo-2.3-javadoc.jar
	android/caao-android-appTest/lib/robotium-solo-2.3.jar
	android/caao-android-appTest/pom.xml
	android/caao_android_app/AndroidManifest.xml
	android/pom.xml
	databases/hadoop/pom.xml