resolve problems
Merge branch 'development' of https://github.com/kevingcfcb88/sicmec.git into development