fix action test
Merge branch 'master' of git://github.com/oat-sa/tao-core

Conflicts:
	views/js/layout/actions/common.js