-- cosmetic changes to android app
-- CI links in readme
-- minor changes to android resourses
-- CI links in readme
Merge branch 'master' into dev

Conflicts:
	README.md
-- added cassandra maven module and driver from DataStax (https://github.com/datastax/java-driver)
-- minor changes to folder structure for sql files
adding missed files to the branch

--
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch dev
# Your branch is ahead of 'origin/dev' by 1 commit.
#   (use "git push" to publish your local commits)
#
# Changes to be committed:
#	modified:   osgi/CAAOOSGiBundle/pom.xml
#	modified:   osgi/OSGiBundleTest/src/test/fi/uef/TestAll.java
#
# Untracked files:
#	README.md.orig
#	android/caao_android_appTest/gen-external-apklibs/
#	caao-osgi-bundle-0.0.1.jar
#	databases/mysql/
#