BAP-904: fixed flash messages
Merge branch 'master' of github.com:laboro/crm-dev
Merge branch 'master' of github.com:laboro/crm-dev
Merge branch 'master' of github.com:laboro/crm-dev
Merge branch 'master' of github.com:laboro/crm-dev
BAP-1258: Added templates hinting to output in dev mode in order to help frontend developers to find proper template files
BAP-1258: Added ability to enable debug for all CSS and JS assets in oro assetic
BAP-1258: added debug assetic nodes to dev config
Merge remote-tracking branch 'remotes/origin/master' into feature/templates_hinting

Conflicts:
	app/config/config.yml
	src/Oro
Updated reference to Oro
Merge with master
Merge with master
CRM-286: Correspondence visibility
 -CRM-294:  Create doctrine entity classes in EmailBundle
 -CRM-301: Add TWIG template which is used to display a particular email details
 -CRM-298: Add template to display emails
Reference Update
Reference Update
Reference Update
Reference Update
Reference Update
CRM-286: Correspondence visibility
Merge remote-tracking branch 'remotes/origin/master' into feature/templates_hinting

Conflicts:
	app/config/config.yml
	src/Oro