lj
Merge branch 'master' of https://github.com/falkin/AIGSElectron.git

Conflicts:
	AIGSElectron/src/ch/eif/ihm2/ihm/GameFrame.java