Merge pull request #27 from kobliha/master

Changes related to including License in the resulting package
Unfinished Services Manager Proposal

- To be taken over by Vlado...