Update files to 2013-06-20
Merge branch 'master' of github.com:fardus/apbif-gestion

Conflicts:
	composer.lock
modified book