updated some stufffffffffff

-fixed a null pointer exception
-availability is now parsed by a StringTokenizer instead of being
deserialized by jackson
-added a class to try to deserialize availability though the use of
jackson, ***not working atm***
Merge branch 'master' of https://github.com/joubin/CSC191