first version
Merge branch 'develop' of github.com:marius311/cosmoslik into develop