making photos public
Merge pull request #366 from time-exchange-gr/for-upstream

making photos public. seems like making them private would be a good admin preference.
fixing link in email verification message
add text version of email_verification. related to gh-372
fix for Issue 283
fix for Issue 283
Merge remote-tracking branch 'ratnamraju/issue_283'
cosmetic changes for displaying shared addresses
bundle update rmagick and therubyracer. closes gh-367
closes gh-279
Merge remote-tracking branch 'upstream/master'
Merge pull request #376 from fablife/master

Closes gh-279
closes issue gh-278
public uploads admin preference. closes gh-371
Reverted json/xml formatting to initial state before issue 278 as per request by Tom
Merge remote-tracking branch 'fablife/skillbank_reqs' into gh-278
Merge remote-tracking branch 'upstream/master'
closes gh-289
closes gh-313
Merge remote-tracking branch 'upstream/master' into upstream-test

Conflicts:
	config/initializers/carrierwave.rb
	db/schema.rb