Merge branch 'master' into develop
new branch
circlehelper added
add test cases
add some files
new files
complete adding author but need add controler
little change
change UI
Merge branch 'develop' of github.com:frankdede/CMPUT410W14T07 into develop

Conflicts:
	information
	server.py
merge
add admin new model
add markdown(work). pip install markdown first before running seriver
add markdown(work). pip install markdown first before running seriver
change login and admin page
Merge branch 'develop' of github.com:frankdede/CMPUT410W14T07 into develop
refine the register form and check upload file size
Complete register form
dismiss progress
Added AuthorController