c
c
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	android-support-v7-appcompat/bin/android-support-v7-appcompat.jar
	android-support-v7-gridlayout/bin/android-support-v7-gridlayout.jar
	bin/ClientArte.apk
	bin/classes.dex
	bin/resources.ap_
Commit 23/08/2014_01
Commit 23/08/2014_02
Commit 23/08/2014_03
Commit 23/08/2014_04
Commit_
Commit_02
c