updated junit tests to conform to new testing standard
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/xilinx/XilinxTclStore
cleaned formatting, added more error checks and correct 'current file' to launch_server, fixed tests to no longer manipulate XILINX_TCLAPP_REPO
Latest updates. Updated tk_tunnel to 1.2
Updated 2014.3 catalog for tk_tunnel
Merge pull request #268 from dpefour/master

Merged pull request 240. Updated 2014.3 catalog