Google Webmaster Verification Fixed
Merge remote-tracking branch 'origin/master'

Conflicts:
	picasso/index/urls.py