Attempting to sync my changes with git before it gets hard to merge
committed to fast-forward
Adding this extra file...
src/com/intellij/plugins/haxe/ide/rearranger/HaxeRearrangerModel.java
Merge branch 'ClassHierarchy' of github.com:TiVo/intellij-haxe into ClassHierarchy

Conflicts:
	src/com/intellij/plugins/haxe/ide/hierarchy/HaxeHierarchyUtils.java
	src/com/intellij/plugins/haxe/ide/hierarchy/call/HaxeCallHierarchyProvider.java
	src/com/intellij/plugins/haxe/lang/psi/impl/AbstractHaxePsiClass.java
	src/com/intellij/plugins/haxe/lang/psi/impl/HaxePsiMethod.java
	src/com/intellij/plugins/haxe/util/HaxePresentableUtil.java
compilable - merged with Eric's changes and resolved branch conflicts.
Merge branch 'ClassHierarchy' of github.com:TiVo/intellij-haxe into ClassHierarchy

Conflicts Resolved:
	src/com/intellij/plugins/haxe/lang/psi/impl/HaxePsiMethod.java