Merging of branch develop
Merge branch 'develop'

Conflicts:
	config/zsh/aliases-git.zsh
Updating submodule.
Removing  with ConvertLineEndingsToUnix.
Updating feature-finish to NOT remove the branch when merging.
Renaming git-feature-finish to git-import-feature
Merge branch 'master' into develop