General maintenance
Merge remote-tracking branch 'origin/master'

Conflicts:
	RestBuilder/src/com/diners/compiler/as400/AS400Commands.java
	RestBuilder/src/com/diners/compiler/tasks/callbacks/BaseCallback.java
	RestBuilder/src/com/diners/compiler/tasks/callbacks/CompilePfLfCallback.java