make image and file thumbnails into jpgs for Chrome, remove will paginate from gemfile
after bundle install
all html in text fields, show resource thumbnails in activity and problem show views
update to authentication filters on experience points controller to allow parents to view xp show
Merge remote-tracking branch 'upstream/master'