........
.......
Merge remote branch 'origin/master'

Conflicts:
	lib/db.php
	lib/organizer.php
	projects/agenda/backend/book.php
	projects/agenda/book/clients.json
	projects/agenda/book/sector2/2014/04-01.json
	projects/agenda/book/sector2/2014/04-02.json
	projects/agenda/book/sector2/2014/04-03.json
	projects/agenda/book/sector2/2014/04-04.json
	projects/agenda/book/sector2/2014/04-05.json
	projects/agenda/book/sector2/2014/04-07.json
	projects/agenda/book/sector2/2014/04-08.json
	projects/agenda/book/sector2/2014/04-09.json
	projects/agenda/book/sector2/2014/04-10.json
	projects/agenda/book/sector2/2014/04-11.json
	projects/agenda/book/sector2/2014/04-12.json
	projects/agenda/book/sector2/2014/04-15.json
	projects/agenda/book/sector2/2014/04-16.json
	projects/agenda/book/sector2/2014/04-17.json
	projects/agenda/book/sector2/2014/04-22.json
	projects/agenda/book/sector2/2014/04-23.json
	projects/agenda/book/sector2/2014/04-24.json
	projects/agenda/book/sector2/2014/04-25.json
	projects/agenda/book/sector2/2014/04-26.json
	projects/agenda/book/sector2/2014/04-28.json
	projects/agenda/book/sector2/2014/04-29.json
	projects/agenda/book/sector2/2014/04-30.json
	projects/agenda/book/sector2/2014/05-02.json
	projects/agenda/book/sector2/2014/05-03.json
	projects/agenda/book/sector2/2014/05-07.json
	projects/agenda/book/sector2/2014/05-09.json
	projects/agenda/book/sector2/2014/05-10.json
	projects/agenda/book/sector2/2014/05-13.json
	projects/agenda/book/sector2/2014/05-16.json
	projects/agenda/book/sector2/2014/05-17.json
	projects/agenda/book/sector2/2014/05-20.json
	projects/agenda/book/sector2/2014/05-21.json
	projects/agenda/book/sector2/2014/05-23.json
	projects/agenda/book/sector2/2014/05-27.json
	projects/agenda/book/sector2/2014/05-30.json