Some Search html changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	DjangoProject/.idea/workspace.xml
Merge branch 'master' of https://github.com/pallavikhandekar/PhotographR