test 2 application ds un meme projet
Merge branch 'master' of https://github.com/mathildegui/bab.git

Conflicts:
	project.properties
New activity