Merge branch 'master' into develop
add operation types for price, owner
Merge branch 'develop' of github.com:softwareplanet/automizely into develop