maj list

@author: GMartigny
Merge origin/master

Conflicts:
	src/org/imie/views/MainActivity.java