Updated with new jpf.properties
Merge branch 'master' into gh-pages

Conflicts:
	eclipse-jpf.site/plugins/eclipse-jpf_1.0.0.201312051008.jar
	eclipse-jpf.site/plugins/eclipse-jpf_1.0.0.201312051223.jar
	update/features/gov.nasa.jpf.eclipsejpf_1.0.0.201312051008.jar
	update/plugins/eclipse-jpf_1.0.0.201312051008.jar