Fixed create and delete actions.
Merge branch 'master' of github.com:marcdel/Rails

Conflicts:
	PhotoGallery/.idea/workspace.xml
	PhotoGallery/app/controllers/photos_controller.rb