allo
allo2
Merge pull request #27 from SDenis-STH/master

button settings removed
Merge pull request #28 from SDenis-STH/icedkiller-master

Merge pull request #27 from SDenis-STH/master
Merge branch 'master' of https://github.com/hopital/JDB into hopital-master

Conflicts:
	tp04/src/ca/qc/cegepsth/jdb/model/Photo.java
Merge branch 'hopital-master'
Merge branch 'master' of https://github.com/SDenis-STH/JDB
Merge pull request #29 from SDenis-STH/master

mise à jour
Merge pull request #30 from SDenis-STH/Contacts

Merge pull request #29 from SDenis-STH/master
Merge pull request #31 from SDenis-STH/master

fin du cours du 2 décembre
Merge pull request #32 from SDenis-STH/PhotoModel

Merge pull request #31 from SDenis-STH/master
Merge pull request #33 from SDenis-STH/master

fin du cours du 2 décembre
Merge pull request #34 from SDenis-STH/PhotoView

Merge pull request #33 from SDenis-STH/master
Merge branch 'master' of https://github.com/icedkiller/JDB

Conflicts:
	tp04/src/ca/qc/cegepsth/jdb/view/WriteLogActivity.java
new background, fixed icon