modifiche
Merge remote-tracking branch 'origin/master'

Conflicts:
	WebDev/WebDev/urls.py
	WebDev/WebDev/views.py
modifiche
modifiche
modifiche
Merge branch 'master' of https://github.com/WebValley2014/WebDev
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/dataSources.xml
	WebDev/WebDev/forms.py
	WebDev/WebDev/urls.py
	WebDev/WebDev/views.py
Merge remote-tracking branch 'origin/master'
upload and saving of one file