Fix some stuff + License
Merge branch 'master' of https://github.com/Tschrock/PM-XPerience