merge
Merge branch 'develop' of https://github.com/VanetSim/VanetSim into develop

Conflicts:
	.gitignore