Merge branch 'master' into develop

# Conflicts:
#	SoniControl/.idea/gradle.xml
#	SoniControl/.idea/runConfigurations.xml
#	SoniControl/app/.gitignore
#	SoniControl/app/proguard-rules.pro
#	SoniControl/app/src/androidTest/java/at/ac/fhstp/sonicontrol/ExampleInstrumentedTest.java
#	SoniControl/app/src/main/java/at/ac/fhstp/sonicontrol/CommonUtils.java
#	SoniControl/app/src/main/java/at/ac/fhstp/sonicontrol/DoubleFFT_1D.java
#	SoniControl/app/src/main/jni/CMakeLists.txt
#	SoniControl/app/src/main/res/mipmap-hdpi/ic_launcher.png
#	SoniControl/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
#	SoniControl/app/src/main/res/mipmap-mdpi/ic_launcher.png
#	SoniControl/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
#	SoniControl/app/src/main/res/mipmap-xhdpi/ic_launcher.png
#	SoniControl/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
#	SoniControl/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
#	SoniControl/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
#	SoniControl/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
#	SoniControl/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
#	SoniControl/app/src/main/res/values/colors.xml
#	SoniControl/app/src/main/res/values/styles.xml
#	SoniControl/app/src/test/java/at/ac/fhstp/sonicontrol/ExampleUnitTest.java
#	SoniControl/build.gradle
#	SoniControl/gradle.properties
#	SoniControl/gradle/wrapper/gradle-wrapper.jar
#	SoniControl/gradle/wrapper/gradle-wrapper.properties
#	SoniControl/gradlew
#	SoniControl/gradlew.bat
#	SoniControl/settings.gradle