SB-1329461 timesheet
Cbr & Offer Processing route
Merge branch 'master' of https://github.com/0325189/wmpm2014

Conflicts:
	wmpm2014-flightfinder/WMPM2014-FlightFinder/src/main/java/at/tuwien/flightfinder/routes/OfferProcessingRoute.java
OffersEnricher, Populating Database with data
Merge branch 'master' of https://github.com/0325189/wmpm2014

Conflicts:
	wmpm2014-flightfinder/WMPM2014-FlightFinder/src/main/java/at/tuwien/flightfinder/beans/OffersEnricher.java
	wmpm2014-flightfinder/WMPM2014-FlightFinder/src/main/java/at/tuwien/flightfinder/routes/OfferProcessingRoute.java