modify the org part
Merge remote branch 'hello/master'

Conflicts:
	portal/views.py
modify the org part
Merge remote branch 'hello/master'

Conflicts:
	portal/query.py
Merge pull request #3 from lucknessbuaa/master

modify the org part