jboer/Apollostation17 — pull request #1 by laser50 (2012-04-18 13:21:41+00:00)
Title: Fixed some shit

Changed most of the names back, Some small optimizations and personal things.
This'll do for now.
(Note: This is a newer version than the SVN, The SVN is no longer in use.)