Merge pull request #23 from dwenzel/dev

merge 0.1.1-dev
Update ext_emconf.php

version 0.2.0, beta status set
resolve merge conflict
merged master