Merge remote-tracking branch 'origin/gh-pages'
completed wk2 project
have both connection and geolocation feature working on both android and ios, but unable to resolve issues with camera api.
Merge remote-tracking branch 'origin/master' into gh-pages