a2 (bygeraldo)
Merge branch 'master' of github.com:mourthe/ai2014

Conflicts:
	PrologC/PrologC.h
	src/Assemble/Controller/AgentController.cs
	src/Assemble/Controller/Enums.cs
	src/Assemble/Controller/Helper.cs
Merge branch 'master' of github.com:mourthe/ai2014
Merge branch 'master' of github.com:mourthe/ai2014

Conflicts:
	Prolog/rules.pl
ajusta elementos de interface com getammo
Merge branch 'master' of github.com:mourthe/ai2014
mais tentativas de setTimeout
prioriza o move ao turn no bestmove e tira safe do turn
Merge branch 'master' of github.com:mourthe/ai2014

Conflicts:
	src/Assemble/Controller/AgentController.cs
Merge branch 'master' of github.com:mourthe/ai2014

Conflicts:
	Prolog/rules.pl
	src/Assemble/Controller/AgentController.cs