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

Conflicts:
	WebDev/WebDev/urls.py
Merge branch 'master' of https://github.com/WebValley2014/WebDev
prova