Issues/16

99% of the changes in properties-custom.jsp are about indentation, sorry about the large diff.