Merge branch 'master' into handin

Used "ours" strategy. This should keep paths happy in both
master and handin branchs
Merge branch 'master' into handin

Conflicts:
	src/ArticulatedRadio.cpp
	src/ArticulatedRadio.hpp
	src/Sun.hpp
Merge branch 'master' into handin
Starfield.jpg somehow got left beind
Added project gallery
Merge pull request #1 from slavik262/handin

Master -> Handin