Made it 2.1.9
Merge branch 'master' of git.assembla.com:unifiedtrinity
added tiklandian tank visage support
Added Experience Inactivity Timer
Merge branch 'Phobix-unifiedtrinity-fork:master' into 'master'

tiklandian visage support

Merged-on: https://www.assembla.com/code/unifiedtrinity/git/merge_requests/1111403
Trinity will now clear & refresh the cache every tick

Trinity combat handler is now a coroutine
Reorganized and cleaned up Trinity Advanced tab
Merge branch 'master' of git://git.assembla.com/unifiedtrinity

Conflicts:
	Trinity/Combat/Abilities/WitchDoctorCombat.cs
WizardSettings
Added Greed's domain objects to force destructible Dictionary