ctrl+shift+f
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/businesslogic/approvalbl/PassApproval.java