Codesprint berlin 2014 Rebased

This is the rebased version of the pull-request #366 which is now be able to merge into master.

The Conflicted changes have been manually merged and the build w/o problem on local machine incl. integration test.