Refactored code for devices
Merge branch 'vertis' of https://github.com/adityagodbole/formbuilder into ci-944_1
Resolved Merge conflicts
Merge branch 'vertis' of https://github.com/adityagodbole/formbuilder into ci-944_1
Renamed modal from 'myModal' to 'gmapModal'
Merge pull request #34 from adityagodbole/ci-944_1

Ci 944 1