December 13 2014 version

Re-introduce all 2013 fixes and merged them with the 2014 ones. Updated
the executable ADI.jar