Merge branch 'master' of github.com:WebValley2014/WebDev

Conflicts:
	WebDev/WebDev/models.py