merging commits
Merge branch 'master' of https://github.com/0325189/wmpm2014

Conflicts:
	wmpm2014-flightfinder/WMPM2014-FlightFinder/src/main/java/at/tuwien/flightfinder/beans/EuropeanFlightsFilter.java
	wmpm2014-flightfinder/WMPM2014-FlightFinder/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
OffersEnricher (structure)
Merge branch 'master' of https://github.com/0325189/wmpm2014

Conflicts:
	wmpm2014-flightfinder/WMPM2014-FlightFinder/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst