start

@author: Guillaume
Merge origin/master

Conflicts:
	AndroidManifest.xml
	res/drawable-hdpi/ic_launcher.png
	res/drawable-mdpi/ic_launcher.png
	res/drawable-xhdpi/ic_launcher.png
	res/values/strings.xml