test 2
Merge branch 'staging'
add MObject class (Mapco.Object)

use it as base class for objects
add MObject class (Mapco.Object)

use it as base class for objects
add some incomplete payment and shipping stuff
some changes on payment, order and shipping
add MShippingAddress class and add getShippingAddress to MOrder class
add view catalog
update payment shipping order
add catalog create stuff
clear directory
add core api imges for catalog
add catalog criteria
Merge branch 'dev_chaendler' of bitbucket.org:mapcodeveloper/mapco-system into dev_catalog
add files for master branch
add missing files