merges staging
updates rvmrc file
In progress updates to provincial report
Merge remote-tracking branch 'richard/master' into richard-feedback
merges richard's commit
Adds error gems
Merging Richards commits
merging richard's edits
merges validation errors
Merge branch 'richard-feedback' into province-report
updates province, district and fishery reports. adds dynamic email to button responding to environment. adds calculated CPUE to landings.
changes landing.value to integer. adds heroku compliant env variables
resolves merge errors
Updates province show. Adds excel and pdf download buttons. Adds kaminari.
adds jquery datatables and ajaxable pagination
updates gear index view
adds biology fields to fish model, and threatened species toggle to form
maxes styling changes to fish form
Adds export to xls and pdf
test merge