fixed bug for not merging properly
added translatable date function
Merge branch 'adoveo-client' of git://github.com/neam/yii-workflow-ui into adoveo-client

Conflicts:
	config/yii-workflow-ui.php