Final commit week 3. Five native features working on both platforms, 3 live data api's working on both platforms. 2 Mashups working on both platforms. HTMLvideo demonstrated in video review and removed per instructions. HTML video did not work in android.
Merge remote-tracking branch 'origin/Development'
Merge remote-tracking branch 'origin/master' into gh-pages