newly fetched
changes?
mmmh???
???
???
????
refresh
Merge branch 'master' of https://github.com/dickerpulli/playground.git

Conflicts:
	commons/maven-vorlage/pom.xml
	commons/maven-vorlage/src/main/resources/log4j.properties
	commons/maven-vorlage/src/test/resources/log4j.properties
	tools/googleapps/src/main/java/de/tbosch/tools/googleapps/controller/GoogleAppsApplicationController.java
	tools/googleapps/src/main/java/de/tbosch/tools/googleapps/controller/TrayiconController.java
	tools/googleapps/src/main/java/de/tbosch/tools/googleapps/dao/GCalendarEventEntryDao.java
	tools/googleapps/src/main/java/de/tbosch/tools/googleapps/dao/impl/GCalendarEventEntryDaoImpl.java
	tools/googleapps/src/main/java/de/tbosch/tools/googleapps/fxml/GoogleAppsApplication.fxml
	tools/googleapps/src/main/java/de/tbosch/tools/googleapps/model/GCalendarEventEntry.java
	tools/googleapps/src/main/java/de/tbosch/tools/googleapps/service/GoogleAppsService.java
	tools/googleapps/src/main/java/de/tbosch/tools/googleapps/service/PreferencesService.java
	tools/googleapps/src/main/java/de/tbosch/tools/googleapps/service/impl/GoogleAppsServiceImpl.java
	tools/googleapps/src/main/java/de/tbosch/tools/googleapps/service/impl/PreferencesServiceImpl.java
	tools/googleapps/src/main/java/de/tbosch/tools/googleapps/utils/GoogleAppsContext.java
	tools/googleapps/src/main/resources/applicationContext.xml
	tools/googleapps/src/main/resources/googleapps.properties
	tools/googleapps/src/main/resources/log4j.properties
	tools/googleapps/src/main/resources/messages.properties
	tools/googleapps/src/test/java/de/tbosch/tools/googleapps/dao/impl/GCalendarEventEntryDaoImplDbTest.java