shit
Merge branch 'master' of ssh://github.com/gregaubert/Cinemania_client

Conflicts:
	res/layout/profit.xml
	src/com/cinemania/network/Utilities.java
	src/com/cinemania/network/api/API.java