Changes getAvailableActionPoints(...) since the logic was flawed. Implemented more validity checking for select actions
Resolved merge conflict with controller branch to my name branch