Changed GameElement subclasses and action classes to be more cohesive
with the idea of single superclasses. Fixed a number of bugs that have
appeared throughout the process.
Fixed merge conflicts due to class name changes of the game elements package
gameelement merge conflicts