up
fail
delete IE jcrop
toggle
hot tag
change activity time position
airport responsive
xx
Merge pull request #48 from opporlink/statm

Messaging Refactored
test
Merge pull request #49 from opporlink/zhangshaokang

Zhangshaokang
test
update 20131209
msg css
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
Merge pull request #50 from opporlink/zhangshaokang

Zhangshaokang
uodate ques.java
fixed CSSA published activity
Merge branch 'temp'
Merge pull request #51 from opporlink/jessie

Jessie