Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/src/main/java/com/dbs/mplus/knuh/MainActivity.java