tuuuuning
Merge branch 'master' of
https://godsend@github.com/gregaubert/Cinemania_client.git

Conflicts:
	src/com/cinemania/constants/AllConstants.java