demerde
Finconflit

Merge branch 'master' of https://github.com/clemontigny/iStoageGit.git

Conflicts:
	iStoage/src/fr/univsavoie/istoage/client/TwitterRest.java