Clean import
Merge branch 'master' of
ssh://git@github.com/gregaubert/Cinemania_client.git

Conflicts:
	src/com/cinemania/activity/Base.java