Finish the developer part
Merge branch 'hackathon' of github.com:xzengCB/Hackathon2014Q4 into hackathon