Ernest314/ftc-ohs — pull request #13 by Ernest314 (2012-10-24 03:03:40+00:00)
Title: Development--Preparation for merge.

Going to merge Master and Development.