new page
Merge branch 'master' of https://github.com/BingyZhang/DEMOS

Conflicts:
	EA/auth/views.pyc
	EA/elect_def/tasks.pyc
	EA/elect_def/views.pyc