pull charlotte
Merge branch 'master' of https://github.com/Harpaga/harpagaproject

Conflicts:
	app/cache/dev/appDevUrlGenerator.php
	app/cache/dev/appDevUrlGenerator.php.meta
	app/cache/dev/appDevUrlMatcher.php
	app/cache/dev/appDevUrlMatcher.php.meta
	app/cache/dev/profiler/index.csv
	app/cache/dev/twig/21/b6/274c0fe3ddc839a6cee459f358c98044bc45c7caf077394a8ac258bf92a0.php
	app/cache/dev/twig/27/6f/5b246a3f693e29a65885cd998d44dccc33a37845d8c764f97c51ff5f153b.php
	app/cache/dev/twig/33/d6/6fd093285eddd83d29c749fd90ba208cd3a4e01cc4ff24488e8ac5145098.php
	app/cache/dev/twig/36/42/1246e6afc74bdd5786af3f7f848223397b195c6a4521f9b0b34bfc14daac.php
	app/cache/dev/twig/3a/11/cc54863905dffa8a41a48b687f32eb0195ba6ac640a2b445da55fa57a6aa.php
	app/cache/dev/twig/3a/92/fd9b6da65a40cdc6bb232e7952278dd2101bda0ab952b1fde37997adbbd9.php
	app/cache/dev/twig/46/0c/baa29fef80df5c2dce8ae2884d6eb7c477aa1c77b3cfb6d2a8fac951e185.php
	app/cache/dev/twig/47/7a/08c870efc0635fa06c173745bb74702a1719866cbea819a1711a2640a753.php
	app/cache/dev/twig/85/88/dce7f34ecd5dc83f220b1f9147393d546d23202d4ae7219af7baae3c2078.php
	app/cache/dev/twig/bc/e8/55a1ea8eb9954647d7681cca4050db435c1e9f4a73404d5aa82aca7b2d76.php
	app/cache/dev/twig/c0/f7/e281b9364b1acc2ca9a213fca638caeee36de805c29ffa938b86bf547b58.php
	app/cache/dev/twig/cb/dc/584002b0d4560922384bb8c447a3cb09cc051b0dabcf7f43130817f7307a.php
	app/cache/dev/twig/d4/3d/7ee1a2a0a0cd9f339d1ba05f912ff76312a1a8c3158d6fb2ed12ac324cdc.php
	app/cache/dev/twig/d7/da/4795526e94a9d4592e6a97df9bae20de425f00770dd91ea391bef29b9990.php
	app/cache/dev/twig/d9/3c/f513fa0f094fba3dc83e81dcb6355468104aa301eb6b90f9561baecd1e31.php
	app/cache/dev/twig/dd/92/4291a60c1cd7841007f045fafa36a667f669875880d175bfaee72c8547a7.php
	app/logs/dev.log
	app/logs/prod.log