up
update 20131209
Merge branch 'zhangshaokang' of github.com:opporlink/op into liuchunyang

Conflicts:
	app/views/Activities/index.html
	app/views/QuestAnsw/searchPage.html
	app/views/SimpleUsers/signup.html
	public/stylesheets/activity.css
uodate ques.java
update ques
update my ques
add page
change main.html
Update QuestAnsw.java

update ques
Update user.css

change user.css
Update searchPage.html

change searchpage.html
Update showQuesInfo.html

change showQuesinfo.html
Update QuesIndex.html

change quesindex.html
Update editQues.html

change editQues.html
测试修改的文字
测试修改的东西
测试修改提交
commit
change ques bug
更新成功页面倒计时跳转设置