fixing fb pic upload
updated rails to 3.2.17
Photos working correctly
Merge commit 'bbcc990fd8de579484eb455399da349483fb3c93'

Conflicts:
	Gemfile.lock