removed wrong eol in shell script
corrected bug in command line for unix
Merge branch 'master' into develop

Conflicts:
	.gitignore
Merge branch 'develop' into dev/routing