test
Merge branch 'master' of https://github.com/jimousse/mobserv_remote_controller

Conflicts:
	.idea/.name
	.idea/misc.xml
	.idea/modules.xml
	app/app.iml
	app/src/main/java/android/eurecom/fr/remotecontroller/MainActivity.java