Merge pull request #7 from ideban/fix

modify contact page
Merge branch 'fix' of https://github.com/ideban/test into fix

Conflicts:
	views/contact/search.html
Merge pull request #9 from ideban/fix

Fix Contact page's bug