Add officer controller
Merge branch 'master' of github.com:lilykuang/Fall14HKSA