Distinguish between move / fire phase graphically, fixes last part of #33.

refs #33
Merge branch 'master' of https://github.com/zrho/afp