Updated schema.rb to remove trails that left behind by merge.
Updated application_helper.rb to fix an issue introduced by commit 741624a15460 from DCC
Merge branch 'master' into deployment