Timeline times are now in normal time

No more military time
Merge remote-tracking branch 'origin/master' into chris
Finished military time
Update code to change military time

Found a more efficient way to do it using simpledateformat
Trying to add individual event page and bg color

Code to go to individual event page on click and also change background
color of app to white. I have yet to test this code because the server
with the timeline info randomly just stopped letting me connect. I also
added an error message to show in the place of the listview if the data
fails to load