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

Conflicts:
	projects/agenda/book/clients.json
	projects/agenda/book/sector2/2014/01-05.json
	projects/agenda/book/sector2/2014/01-06.json
	projects/agenda/book/sector2/2014/01-17.json
	projects/agenda/book/sector2/2014/02-01.json
	projects/agenda/book/sector2/2014/02-04.json
	projects/agenda/book/sector2/2014/02-05.json
	projects/agenda/book/sector2/2014/02-06.json
	projects/agenda/book/sector2/2014/02-07.json
	projects/agenda/book/sector2/2014/02-08.json
	projects/agenda/book/sector2/2014/02-11.json
	projects/agenda/book/sector2/2014/02-12.json
	projects/agenda/book/sector2/2014/02-13.json
	projects/agenda/book/sector2/2014/02-14.json
	projects/agenda/book/sector2/2014/02-15.json
	projects/agenda/book/sector2/2014/02-18.json
	projects/agenda/book/sector2/2014/02-19.json
	projects/agenda/book/sector2/2014/02-20.json
	projects/agenda/book/sector2/2014/02-21.json
	projects/agenda/book/sector2/2014/02-22.json
	projects/agenda/book/sector2/2014/02-25.json
	projects/agenda/book/sector2/2014/02-26.json
	projects/agenda/book/sector2/2014/02-27.json
	projects/agenda/book/sector2/2014/02-28.json
	projects/agenda/book/sector2/2014/03-04.json
	projects/agenda/book/sector2/2014/03-05.json
	projects/agenda/book/sector2/2014/03-06.json
	projects/agenda/book/sector2/2014/03-07.json
	projects/agenda/book/sector2/2014/03-08.json
	projects/agenda/book/sector2/2014/03-11.json
	projects/agenda/book/sector2/2014/03-12.json
	projects/agenda/book/sector2/2014/03-13.json
	projects/agenda/book/sector2/2014/03-14.json
	projects/agenda/book/sector2/2014/03-15.json
	projects/agenda/book/sector2/2014/03-18.json
	projects/agenda/book/sector2/2014/03-19.json
	projects/agenda/book/sector2/2014/03-20.json
	projects/agenda/book/sector2/2014/03-22.json
	projects/agenda/book/sector2/2014/03-25.json
	projects/agenda/book/sector2/2014/04-01.json
	projects/agenda/book/sector2/2014/04-05.json
	projects/agenda/book/sector2/2014/04-08.json
	projects/agenda/book/sector2/2014/04-09.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