Merge branch 'master' of /Users/rbm/Sites/exaprint/api-etiquettes with conflicts.
Merge pull request #1 from exaprint/templates

Templates
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/index.php
Merge pull request #2 from exaprint/templates

oublie de add
Merge pull request #3 from exaprint/templates

variable environnement
Merge pull request #4 from exaprint/templates

changement repertoire include
Merge pull request #5 from exaprint/templates

lien bootstrap
Merge pull request #6 from exaprint/templates

lien bootstrap
Merge remote-tracking branch 'origin/master'
Merge pull request #7 from exaprint/templates

lien bootstrap
Merge pull request #8 from exaprint/templates

lien des repertoires js images css
Merge pull request #9 from exaprint/templates

lien des repertoires js images css
content type json supprimer dans index.php