updated
Merge branch 'master' into gh-pages

Conflicts:
	update/features/gov.nasa.jpf.eclipsejpf_1.0.0.201310311633.jar
	update/plugins/eclipse-jpf_1.0.0.201310311633.jar