AlarmActivity : first elements
Fix update that update only one punch each time, Try to fix bug when punching display punch ok but no actual punching is done...
Fix update that update only one punch each time, Try to fix bug when punching display punch ok but no actual punching is done...
Merge remote-tracking branch 'origin/master'
Merge branch 'master' into develop
target next version (1.2) in develop
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	AgatteClient/src/main/AndroidManifest.xml
	AgatteClient/src/main/res/values-fr/strings.xml
	AgatteClient/src/main/res/values/strings.xml
	gradle/wrapper/gradle-wrapper.properties
included licence header