Merge pull request #96 from malmuki/Gab

Gab
fixed merge bugs
hot fixes
reHotFixe
removed state.getsttatename(useless)
-update watchtower range
-update townCenter name
-now w/ Victory
can only add a single unit to a factory at a time
Merge remote-tracking branch 'origin/dev' into Francois

Conflicts:
	TP3/src/ca/csf/RTS/game/GameController.java
when a queue is empty and is still the first in selectedlist %done is
reset to blank
Merge pull request #97 from malmuki/Francois

Francois
fix
Merge pull request #99 from malmuki/Francois

fix
-performance update in select entity
Merge pull request #100 from malmuki/Francois

-performance update in select entity
more constant
-more Constant again
-test begining
change upgrade place
Merge pull request #102 from malmuki/Francois

Francois
more formating