quedale...
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/tipsy/app/orga/entree/EntreeActivity.java
quedale...