Update (24-11-2013)
Merge branch 'master' of https://github.com/AdalbertFochtler/Sim-TV

Conflicts:
	Shooting Star/Assets/Levels/Assets/Prefabs/newsscene.meta