added cordova js and stylesheets
setup xcode for my machine
conflicts automatically merged
removed heat map link from below