json ordered keys
Merge remote-tracking branch 'origin/master'

Conflicts:

	src/main/java/de/mpg/mpdl/services/neuronProfiler/view/FileUploadBean.java
	src/main/resources/rebel.xml
	src/main/webapp/swcRespHTML.xhtml
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore

	src/main/java/de/mpg/mpdl/services/neuronProfiler/view/FileUploadBean.java
	src/main/resources/rebel.xml