added photoReceived
Merge branch 'master' of https://github.com/aslushnikov/picsha

Conflicts:
	public/javascripts/photos.js