Commit pour pull
Merge branch 'master' of https://github.com/ShopMyLifi/shopmylifi.git

Conflicts:
	shopmylifi/bin/AndroidManifest.xml
test
test
test
Merge branch 'master' of https://github.com/ShopMyLifi/shopmylifi.git

Conflicts:
	shopmylifi/project.properties