Merge remote-tracking branch 'cfinch2/master'
Merge remote-tracking branch 'sbonner1/master'
added a controller and button to test connectivity to database
imported jackson (JSON implementations) libriaries so JSON will work.
Merge remote-tracking branch 'jcoady9/master'