merging
commit
Merge branch 'master' of https://github.com/dickerpulli/playground.git

Conflicts:
	commons/maven-vorlage/src/main/resources/log4j.properties
	commons/maven-vorlage/src/test/resources/log4j.properties
	commons/tbosch-commons/src/test/java/de/tbosch/commons/dao/hibernate/StandardPersonDaoITest.java
	commons/tbosch-commons/src/test/java/de/tbosch/commons/dao/jpa/StandardPersonDaoITest.java
	tools/googleapps/pom.xml
	tools/googleapps/src/main/java/de/tbosch/tools/googleapps/service/GoogleAppsService.java
	tools/googleapps/src/main/java/de/tbosch/tools/googleapps/service/impl/PreferencesServiceImpl.java
jetzt aber
Merge remote-tracking branch 'origin/new'

Conflicts:
	tools/googleapps/src/main/java/de/tbosch/tools/googleapps/service/GoogleAppsService.java
	tools/googleapps/src/main/java/de/tbosch/tools/googleapps/service/impl/GoogleAppsServiceImpl.java
More oauth2