fin de mise en place des boutons des tours
Merge branch 'master' of https://github.com/kilman/master-ra.git
ajout des 3/4 de tools
Merge branch 'master' of https://github.com/kilman/master-ra.git

Conflicts:
	Software/TowerDefenderAndroid/src/net/towerdefender/manager/ResourcesManager.java