Merge pull request #1 from kpiwko/updates

Updates
Moved aerogear-model to test sources