2981
Merge branch 'my_stuff' into develop

Conflicts:
	SimSoccer/SimSoccer.v12.suo
Right
?
Update
Merge branch 'develop' of https://github.com/SimSoccer/master into develop

Conflicts:
	SimSoccer/SimSoccer.v12.suo
?
last update
Merge branch 'develop' of https://github.com/SimSoccer/master into my_stuff

Conflicts:
	SimSoccer/SimSoccer.sln
	SimSoccer/SimSoccer.v12.suo
Pull
Update with SoccerSimulator project
Merge branch 'develop' into my_stuff

Conflicts:
	SimSoccer/SimSoccer.v12.suo