TrojanBox/huameiwang — pull request #3 by TrojanBox (2014-12-02 14:22:32+00:00)
Title: Merge origin/master into development

Conflicts:
Application/Home/Controller/IndexController.class.php