version portable 3
Merge branch 'master' of https://github.com/mporiaux/demogithub1.git

Conflicts:
	src/be/condorcet/demopourgithub1/MainActivity.java