Merge pull request #20 from SDenis-STH/icedkiller-master

Icedkiller master
Modifications de Bugs, Pret pour le Merge
Merge pull request #23 from Charlieee754/master

Modifications de Bugs, Pret pour le Merge
effacer les fichiers inutiles
retrait des .orig
Restructuration
Ajout des Classes Extends
Merge pull request #24 from Charlieee754/master

Ajout des Classes Extends
Restructuration
New pimp icon
Merge branch 'master' of https://github.com/icedkiller/JDB into icedkiller-master
Merge branch 'icedkiller-master'
Merge branch 'master' of https://github.com/SDenis-STH/JDB

Conflicts:
	tp04/bin/res/crunch/drawable-hdpi/ic_launcher.png
	tp04/bin/res/crunch/drawable-mdpi/ic_launcher.png
	tp04/bin/res/crunch/drawable-xhdpi/ic_launcher.png
	tp04/bin/res/crunch/drawable-xxhdpi/ic_launcher.png
Merge pull request #27 from SDenis-STH/master

button settings removed