Changed development from 1.0.5 to 1.0.4-SNAPSHOT
Merge branch 'master' into develop

Conflicts:
	opennms-pris-docs/pom.xml
	opennms-pris/pom.xml
	pom.xml
- PRIS-5: Added list with all asset fields which can be mapped in
  xls.source and jdbc.source
- Added file names in documentation