Initial commit (now using Cordova instead of Phonegap)
Merged