classification
Merge branch 'master' of https://github.com/WebValley2014/WebDev
Merge remote-tracking branch 'origin/master'

Conflicts:
	WebDev/WebDev/admin.py