Merge pull request #8 from asm-products/develop

Bounty 53, 13 and some pricing changes
Merge branch 'master' of github.com:asm-products/cloudroutes-service into develop