change ignore file
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore

	src/main/java/de/mpg/mpdl/service/rest/swc/process/RestProcessUtils.java
	src/main/webapp/WEB-INF/swc-service.properties