Add selectize.js plugin
Merge branch 'master' into PIM-1122
Don't add input-large class to fields if another input class is specified
PIM-1242 : begins to update to BAP Beta
Update app/config/routing.yml
Add app/emails to composer autoload
Update ACL annotation namespace
Update ProductController acl
Inject SecurityFacade in DatagridBuilder
Update acl
Load user fixtures from OroTestFrameworkBundle
Load pim demobundle fixtures
Re-enable oro navigation init
Update bap and config
Update ACL
Merge branch 'master' into update_bap_beta

Conflicts:
	app/config/config.yml
Update config
Update config
Update config
Update acl