fix bugs
Merge branch 'new' of github.com:LilyStudio/2013Autumn-Recruit into new