Merge branch 'refactorizations_and_many_fixes' of https://github.com/Krigpl/hightail into refactorizations_and_many_fixes

Conflicts:
	Hightail/src/org/hightail/Testcase.java