2014 06 18
aaaaa
Merge branch 'master' of
https://github.com/brunano21/ai-project-android.git
Merge branch 'master' of https://github.com/brunano21/ai-project-android
into MM_20140617

Conflicts:
	Clever_Buy/src/it/polito/ai/project/main/MyHttpClient.java