minor changes
Merge branch 'dev' of git://github.com/webtischlerei/moraso