Various Merge fixes and SurgeryType Fix
'LEX' Merge, (c) 2014 Lexcorp ltd., Inc.
Minor UI tweaks
Merge branch 'master' of https://github.com/itraycer/iTraycer into jeuvin