JasonMcRay/InfiTech-1.7 — pull request #46 by JasonMcRay (2014-10-07 19:23:47+00:00)
Title: Complete merge

Merged both branches, will use only Master from now on