merge the origin branch
modify the models.pyc
Merge remote branch 'hello/master'

Conflicts:
	base/models.pyc
add requirejs
 Please enter the commit message for your changes. Lines starting
Merge pull request #2 from lucknessbuaa/master

add requirejs