Update README.md
Update README.md
Merge branch 'master' of https://github.com/VanetSim/VanetSim into develop

Conflicts:
	README.md
Merge branch 'develop' of https://github.com/VanetSim/VanetSim into develop
Bugfixes: Error with OSM Import; Refactoring: Removed old java1.6 backup strategy
- deleted log files
- preparations for data analysis and presentation mode plugin
- minor bugfixes
- code cleanup
- removed non-source folders from tracking
Merge branch 'develop'