Ajaxified product associations in product edit
Corrected bug on activeTab
Created ProductAssociationsController
Merge branch 'master' into task/ajaxify_associations

Conflicts:
	src/Pim/Bundle/UIBundle/Resources/public/js/pim-init.js
Add a behat scenario for updating user preferences
Merge pull request #542 from akeneo/task/ajaxify_associations

Ajaxified product associations in product edit
Merge branch 'master' into feature/ajax_choice_type