fix hackpan -> hackpad
Merge branch 'master' of https://github.com/HanGee/joinNow

Conflicts:
	app/views/article/edit.swig
Merge pull request #19 from yuyaun/master

fix hackpan -> hackpad