Merge branch 'hotfix-2.0.6'
Bumped version to 2.0.6
Using netcare-ui v1.0.1. Bumped version to 2.0.7
Merge branch 'hotfix-2.0.7'
Merged changes.