Marko's way of starting application
Merge branch 'mr3_changes'

Conflicts:
	wmpm2014-flightfinder/WMPM2014-FlightFinder/pom.xml
Merge branch 'master' of https://github.com/0325189/wmpm2014

Conflicts:
	wmpm2014-flightfinder/WMPM2014-FlightFinder/pom.xml
Merge branch 'master' of https://github.com/0325189/wmpm2014.git

Conflicts:
	wmpm2014-flightfinder/WMPM2014-FlightFinder/pom.xml
a stupid commit
db
stupid commit
Merge branch 'master' of https://github.com/0325189/wmpm2014

Conflicts:
	wmpm2014-flightfinder/WMPM2014-FlightFinder/database/testdb.mv.db
	wmpm2014-flightfinder/WMPM2014-FlightFinder/src/main/java/at/tuwien/flightfinder/beans/PrintFlightoffer.java
	wmpm2014-flightfinder/WMPM2014-FlightFinder/src/main/java/at/tuwien/flightfinder/pojo/Flightoffer.java
	wmpm2014-flightfinder/WMPM2014-FlightFinder/src/main/java/at/tuwien/flightfinder/pojo/ObjectFactory.java
	wmpm2014-flightfinder/WMPM2014-FlightFinder/src/main/java/at/tuwien/flightfinder/routes/CbrRecievedFile.java
	wmpm2014-flightfinder/WMPM2014-FlightFinder/src/main/java/at/tuwien/flightfinder/routes/OfferProcessingRoute.java
some commit
Merge branch 'master' of https://github.com/0325189/wmpm2014

Conflicts:
	wmpm2014-flightfinder/WMPM2014-FlightFinder/database/testdb.mv.db
	wmpm2014-flightfinder/WMPM2014-FlightFinder/src/main/java/at/tuwien/flightfinder/routes/MailToFileOffersRoute.java
Merge branch 'master' of https://github.com/0325189/wmpm2014
database removed from track
keep calm and finish Workflow!
Merge branch 'master' of https://github.com/0325189/wmpm2014

Conflicts:
	wmpm2014-flightfinder/WMPM2014-FlightFinder/database/testdb.mv.db
	wmpm2014-flightfinder/WMPM2014-FlightFinder/src/main/java/at/tuwien/flightfinder/routes/MainRouteBuilder.java