Converted rails 1 views to html.erb
Merge branch 'feature/upgrade_rails1_to_2' of github.com:NZX/recon-upgrade into feature/upgrade_rails1_to_2