Upgraded to Rails 4.1 in serparate branch. Few bugs have arisen which need sorting. TRAD-33