Merge branch 'master' of https://github.com/IQSS/dataverse

Conflicts:
	src/main/java/edu/harvard/iq/dataverse/DataversePage.java
Merge branch 'master2'