small code change
new structure
Merge branch 'master' of github.com:hivesolutions/colony_npapi