added rect line width parameter to the intro scene
Merge branch 'master' into robert
Merge branch 'robert'
Merge branch 'robert'
Merge branch 'robert'
Merge branch 'robert'
Merge branch 'robert'
Merge branch 'robert'
Merge branch 'robert'
Merge branch 'robert'
Merge branch 'robert'
Merge branch 'robert'
Merge branch 'robert'
Merge branch 'robert'
Merge branch 'robert'
Merge branch 'robert'
adjust ten opponents scene
more adjusts
Merge branch 'robert'

Conflicts:
	bin/data/intro_drivingScreen.png
	source/scene3controller.cpp
Merge branch 'robert'