Adding somewhat non-working TestUserMatchController
Merge branch 'develop' of github.com:Spantree/okmercury into develop