Codexa/Firetext — pull request #168 by jackd1 (2014-04-09 02:13:47+00:00)
Title: Develop merge

I believe this brings develop up to date with all of the changes, please feel free to review.