Sit data validation page inside iframe
Travis fix
Merge branch 'master' into 138-tghn-iframe

Conflicts:
	src/PublicSite/web/css/dataValidation.css
	src/PublicSite/web/css/main.css
Consistent CSS
IFrame fix
Merge pull request #74 from SEEG-Oxford/138-tghn-iframe

IFrame
Merge branch 'master' into 124-display-all-diseases

Conflicts:
	src/PublicSite/src/uk/ac/ox/zoo/seeg/abraid/mp/publicsite/web/DataValidationController.java
	src/PublicSite/test/uk/ac/ox/zoo/seeg/abraid/mp/publicsite/web/DataValidationControllerTest.java
	src/PublicSite/web/WEB-INF/freemarker/datavalidation.ftl