JSON data displays successfully

parsing info
all json data displaying correctly

made a few changes to service/tideActivity

Had commented out message.arg1 = Activity.RESULT_OK; and forgot to put
it back so it wouldnt display tideHeight.
Merge branch 'master' into gh-pages