Merge pull request #12 from Suckzoo/master

From Master
Added directional light
More rocket functions!
Merge branch 'camera' into Simulation
Rocket launch bababababam
Restrict firing from free-view mode, minor fixation
Merge branch 'master' of https://github.com/Suckzoo/CS482_team

Conflicts:
	OgreSampleSource/World.cpp