Dev debug tools
Merge branch 'master' of git://github.com/newicon/nii-core