Merge with nii-template composer
removed bootstrap from main config
Merge branch 'master' of git://github.com/newicon/nii-core