Nettoyage pour gitignore
Descriptif level json
Deserialisation level
Merge branch 'master' into enemmy_deplacement

Conflicts:
	age-of-tower-android/.classpath
	age-of-tower-android/assets/data/uiskin.json
	age-of-tower/src/com/nsx/ageoftower/screen/MenuScreen.java

Signed-off-by: xclam <romain.rj@gmail.com>
Use of class Level to construct a new level in GameScreen
Signed-off-by: xclam <romain.rj@gmail.com>
Merge the option button

Signed-off-by: xclam <romain.rj@gmail.com>
merge new_hud in enemmy_deplacement
update class Foe, Wave, Level

Signed-off-by: xclam <romain.rj@gmail.com>
Merge branch 'enemmy_deplacement' of github.com:xclam/ageoftower into enemmy_deplacement
Merge the hud

Signed-off-by: xclam <romain.rj@gmail.com>
correction du merge precedent

Signed-off-by: xclam <romain.rj@gmail.com>
Added GameEngine and some windgets
Merged game_engine in enemmy_deplacement
Poping ennemies in the GameEngine
Texture file in the level.json
new .gitignore
cleanupe
Dont use awt.Point that breaks the android version. Also improvement with the timer button
Score screen Added
Score screen aimation