Fix rebase conflict to include refactoring of GlobalController #index action and private methods.
Fix rebase conflict to include refactoring of GlobalController #index action and private methods.

tiger-swallowtails-2014/write-now,tiger-swallowtails-2014/write-now