Merge branch 'master' into permission-vertical

Conflicts:
	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
	java/com.sap.sse.security/src/com/sap/sse/security/impl/SecurityServiceImpl.java

java/com.sap.sse.security.common/AndroidManifest.xml

@@ -1,8 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.sap.sse.security.common"
-    android:versionCode="1"
-    android:versionName="1.1.0">
+    package="com.sap.sse.security.common">
 
-    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="22" />
+    <uses-sdk />
 
 </manifest>

java/com.sap.sse.security.common/build.gradle

@@ -1,4 +1,4 @@
-apply plugin: "java"
+apply plugin: "java-library"
 
 sourceSets {
     main {
@@ -8,5 +8,5 @@ sourceSets {
 
 dependencies {
     /* local dependencies */
-    compile project(":java:com.sap.sse.common")
+    implementation project(":com.sap.sse.common")
 }