Merge pull request #12 from lilfade/dev

commit to master
updated menu's and also removed pm plugin from branch as it has it's own repo now