Change prepares another iterative version of Occurrence detail page. Relates to http://dev.gbif.org/issues/browse/POR-1661
Merge branch 'master' of https://github.com/gbif/portal-web

Conflicts:
	src/main/java/org/gbif/portal/action/occurrence/util/MockOccurrenceFactory.java