334

44
Revert "334"

This reverts commit 1f04ce3aefdad4e15dcb0a1f72cc029f0aaa9b98.
Revert "Revert "334""

This reverts commit 5947bfa033c6698442332521f5b6f7cd34e7b706.
add
Merge branch 'master' of https://github.com/alvinyao/cloudedu

Conflicts:
	cloudedu/templates/base.html
	cloudedu/templates/menu.html
	crud/views.py
	essential/views.py
Merge branch 'master' of https://github.com/alvinyao/cloudedu