change Factory to Container, start to implement Area as a container
Merge branch 'master' of github.com:powerdata/com.powerdata.openpa