Merge branch 'master' of https://github.com/jaake/stranger_danger into server

Conflicts:
	app/controllers/images_controller.rb
restore images
restore images