adjusted developer and production system db structure
Merge branch 'stable'