Merge origin/master

Conflicts:
	src/GLmanual_entry.java
	src/PRCR_Add_staffpay.form
	src/PRCR_Add_staffpay.java
Merge origin/master