Merge pull request #75 from malmuki/dev

Dev
Merge pull request #93 from malmuki/dev

Dev
Merge pull request #94 from malmuki/dev

preps for forge
Merge pull request #98 from malmuki/dev

Dev
Merge pull request #101 from malmuki/dev

Dev
Icons changed, footman unanimated texture also implemented
Added upgrade icons to ressource file
Merge pull request #103 from malmuki/dev

Dev
Merge remote-tracking branch 'origin/dev' into Gab

Conflicts:
	TP3/src/ca/csf/RTS/game/GameController.java
Merge pull request #105 from malmuki/Gab

Gab
Merge pull request #106 from malmuki/master

Devmerge!!!!