Fix
Merge branch 'master' of https://github.com/micktaiwan/scpm into wip
automatically adding lines for eFactory
Merge branch 'master' of github.com:micktaiwan/scpm into factory_master