changes made to embedded ones
Merge branch 'master' of https://github.com/virtuecenter/manager