Adding new photos and created edit view
Merge branch 'ddtrann'

Conflicts:
	data/db.sql