merger
Merge branch 'master' of github.com:GMartigny/android_bicloo

Conflicts:
	src/org/imie/views/MainActivity.java
Merge branch 'master' of github.com:GMartigny/android_bicloo