team::controller enum to use MAKE_ENUM macro
Merge branch 'master' of git://github.com/wesnoth/wesnoth