recup sonar maelle
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/classes/fr/umlv/lastproject/smart/database/DbManager$DbHelper.class
	bin/classes/fr/umlv/lastproject/smart/database/DbManager.class
	bin/classes/fr/umlv/lastproject/smart/form/Mission.class
	gen/fr/umlv/lastproject/smart/R.java
maelle merge ok
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/Smart.apk
	bin/classes.dex
	bin/classes/fr/umlv/lastproject/smart/browser/FileListFragment.class
	bin/classes/fr/umlv/lastproject/smart/browser/utils/FileUtils.class
	bin/classes/fr/umlv/lastproject/smart/browser/utils/MimeTypeParser.class
	bin/classes/fr/umlv/lastproject/smart/utils/ZIPUtils.class
	bin/resources.ap_
	gen/fr/umlv/lastproject/smart/R.java
oo
Merge branch 'master' of https://github.com/Forest-sample/Smart.git

Conflicts:
	bin/Smart.apk
	bin/classes.dex
	bin/classes/fr/umlv/lastproject/smart/HomeActivity.class
	bin/dexedLibs/osmdroid-android-3.0.8-89f5f3f2bdca7fce6753499408e45847.jar
	bin/dexedLibs/slf4j-android-1.5.8-b06370ee42c3701a7b5fcfe53653e312.jar
	bin/resources.ap_
	gen/fr/umlv/lastproject/smart/R.java
	res/values-fr/string.xml
Suppression de string.xml