modified gemfile for anynines
added manifest.yml
modified manifest.yml
Merge remote-tracking branch 'origin/master'

Conflicts:
	test/controllers/photo_controller_test.rb