Merge branch 'dev'
Added working map to promise page
Merge branch 'master' into dev
Merge branch 'dev'
Removed pop-up from map
Merge branch 'dev'
Merge branch 'master' into dev
Merge pull request #3 from alexishope/dev

Added working map to promise page
Put index files in the correct folder
Merge pull request #4 from alexishope/dev

Dev
Changes to logo and spash deactivation
Merge pull request #5 from bigeyex/master

add the codorva.js
Changes to the missing javascript file and added the new apk build
Changes to the .apk and the camera issue
Changing back to static map
Merge pull request #6 from alexishope/dev

Changing back to static map
added the js tag to enable camera

be careful, i had a failed build!