finish 2014.4.28 zhiming claim index
finish 2014.4.28 zhiming claim group_buying
finish 2014.4.28 claim new_home
Merge branch 'feature/edit_index' into develop
finish information of show.html.haml CONFLICT