zino commit
Merge branch 'devel' of http://github.com/appm/appm into devel