Changes in objects, acp, new npi system
Merge branch 'master' of github.com:nopticon/orion