Merge pull request #19 from dapetcu21/master

Latest work from Marius -- new map features and refactorings
Refactor device demo
Fix device-demo bug
Merge pull request #20 from dapetcu21/master

Big map
Merge branch 'master' of github.com:readfwd/delta-app
Merge pull request #21 from dapetcu21/master

Fixed fastclick
Merge pull request #22 from dapetcu21/master

Fixed .gitignore for android projects
Merge branch 'master' of github.com:readfwd/delta-app
Initialized menu item for Code of Conduct #23
Work on Emergency section
Merge branch 'master' of github.com:cdinu/delta-app
Add emergency controller and template -- very draft
Merge branch 'master' of github.com:cdinu/delta-app
added code of conduct