1. Implemented json parsing.
Merge remote-tracking branch 'origin/master'

Conflicts:
	MTDCompanion/src/main/java/edu/illinois/mtdcompanion/data/FileBusStopLoader.java
1. Uncommented database code.
it works
Working with onboard database
fixed server bug
Merge branch 'jsontest'