Add .gitkeep so that tmp and log folders are created when the repo is cloned.
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'production' of github.com:criticaljuncture/my_fr2 into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
Bump rails version to fix vulnerabilities that were just made public.
Conflicts:
	Gemfile
	Gemfile.lock
Add new handlebars helpers for formatting date (using js strftime implementation), checking if date is in past, and truncating a string to a set number of words.
Revert "Add new handlebars helpers for formatting date (using js strftime implementation), checking if date is in past, and truncating a string to a set number of words."

This reverts commit c856cef49f9aff326ea2c20d9df18a99e24f7282.
bump thunder punch gem - removing static role and replacing with worker role
Add loading image with gray background
Change calls to jquery 'delegate/undelegate' to use 'on/off'
Merge branch 'master' into production

Conflicts:
	Gemfile.lock
Handle documents without a granule class that we match.
Handle the fact that we changed unknown to uncategorized. Cast to 'unknown' instead of nil when we need it.
Update devise to get security fix.
security patch
update rails, json