Renamed animation to action
Merge branch 'master' into fife_git

Conflicts:
	fife_rpg/behaviours/base.py