fix for fieldgroup commit issue
add ignore
add ignore
Merge branch 'master' of https://github.com/bsutton/scoutmaster

Conflicts:
	scoutmaster/src/main/java/au/org/scoutmaster/dao/ContactDao.java
	scoutmaster/src/main/java/au/org/scoutmaster/dao/JpaBaseDao.java
	scoutmaster/src/main/webapp/jasperreports/.gitignore