Merge branch 'dev-3'
Merge branch 'master' of https://github.com/basercms/basercms into dev-3