Merge pull request #21 from seeebiii/master

changed data model
Eclipse Code Formatting applied to all classes in the repository
Merge pull request #22 from CloudCycle2/eclipsecodeformatting

Eclipse Code Formatting applied to all classes in the repository