Merge remote-tracking branch 'origin/developerB' into developerB

# Conflicts:
#	src/main/resources/export/payList.xls