adriana
commit Lore
Merge branch 'master' of https://github.com/cipyk/pabd

Conflicts:
	app/cache/dev/appDevDebugProjectContainer.php
	app/cache/dev/appDevDebugProjectContainer.xml
issue2
issue2
test
lore