Merge branch 'rm_production' into wip-open

Conflicts:
	gc_env.sh
update branch for wip and demo server
Merge branch 'rm_production' into wip-open
Merge branch 'rm_production' into wip-open
Merge branch 'rm_production' into wip-open
Merge branch 'rm_production' into wip-open
upgrade rails
security update to rails 3.2.16
Merge branch 'rm_production' into wip-open
Merge branch 'rm_production' into wip-open
Merge branch 'rm_production' into wip-open
Merge branch 'rm_production' into wip-open
Merge branch 'upgrade_will_paginate' into wip-open
Merge branch 'rm_production_rails4_backports' into wip-open
Merge branch 'jasmine' into wip-open
Merge branch '778_fix_reset_password_link' into wip-open
adjust gc settings for deployment
update deployment