Merge pull request #1 from SDenis-STH/master

dhhgdgfh
Erreur arrivée: Tout autre application commencée après le Punch-IN, met
immédiatement le Punch-OUT.   Corrigé

supprimer des commentaires inutile restant.
commit
Merge branch 'master' of https://github.com/icedkiller/JDB into icedkiller-master

Conflicts:
	tp04/gen/com/example/tp04putain/R.java
	tp04/res/values/strings.xml
	tp04/src/com/example/tp04/Journal.java
	tp04/src/com/example/tp04/MainActivity.java
	tp04/src/com/example/tp04/TimeTrackActivity.java
	tp04/src/com/example/tp04/WriteLogActivity.java
	tp04/src/com/example/tp04/evenementJournal.java
Merge branch 'icedkiller-master'
fusion
Merge branch 'Charlieee754-master' into icedkiller-master

Conflicts:
	tp04/bin/classes.dex
	tp04/bin/resources.ap_
	tp04/bin/tp04.apk
	tp04/res/values/strings.xml.orig
Merge branch 'master' of https://github.com/SDenis-STH/JDB into icedkiller-master
Merge pull request #20 from SDenis-STH/icedkiller-master

Icedkiller master