asd
Merge remote-tracking branch 'origin/master'

Conflicts:
	OpenERPMobile/src/com/lacan/openerpmobile/MainActivity.java