updating readme
updating readme
updating readme with branching model and other details
updating readme with branching model and other details
cleaning up and minor refactoring
-- merge dev to master

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch gradle
# Changes to be committed:
#	new file:   android/caao_android_app/build.gradle
#	new file:   android/caao_android_appTest/build.gradle
#	new file:   build.gradle
#	new file:   databases/cassandra/build.gradle
#	new file:   databases/hadoop/build.gradle
#	new file:   databases/mysql/build.gradle
#	new file:   front-end/caao-vaadin-front-end/build.gradle
#	new file:   osgi/CAAOOSGiBundle/build.gradle
#	new file:   osgi/OSGiBundleTest/build.gradle
#	new file:   settings.gradle
#
# Untracked files:
#	.gradle/
#	caao-osgi-bundle-0.0.1.jar
#	gradle/
#	gradlew
#	gradlew.bat
#	out/
#
-- remove of redundant groupId from child poms
-- CI - travis - remove of OpenJDK
-- CI - travis - fix file syntax
-- CI - travis - fix file syntax
-- CI - travis - fix 2 file syntax
-- update of readme + build triggering on CI
-- yaml file syntax fix for android
-- adding license
-- adding license to pom
-- fix yaml file to build android project
-- fix yaml file  -- utulization of latest android tools
-- readme update
-- readme update
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