#85 integrate CLI branch into master

[Till Schäfer]

The GSOC Projekt "Command Line Interface" is not yet integrated into the master branch. We should do so in the near feature to not differ so much, that merging becommes difficult.

Key Question: How good is the quality of the Implementation yet? Is it ready for mainlining?