changed NetworkTable instantiation so that it uses the getTable method instead of using 'new'. All conflicts with 2013 library resolved.
Merge remote-tracking branch 'origin/beta-2013-compatibility'

Making beta changes permanent (to master), to support curent 2013 library.