Merge branch 'master' of https://github.com/bvcms/bvcms.git
merge from master
minify
Merge branch 'develop' of https://github.com/bvcms/bvcms.git