Remove extra images
Merge branch 'Kelly'
Form display css
Merge branch 'Kelly'

Conflicts:
	log/development.log
?