conflict
Merge branch 'master' of https://bitbucket.org/evolutivo/evolutivocore
Merge branch 'master' of https://bitbucket.org/evolutivo/evolutivocore
Merge branch 'master' of https://bitbucket.org/evolutivo/evolutivocore
Merge branch 'master' of https://bitbucket.org/evolutivo/evolutivocore
addbuttonfix
templatefix
Merge branch 'master' of https://bitbucket.org/evolutivo/evolutivocore
ngchange2
install
Merge branch 'master' of https://bitbucket.org/evolutivo/evolutivocore
filter vendor contacts on PO
Fix Calendar4You module translation
Fix Calendar4You module name translation
related to issue #208: Full CORS support: preflight options call support
Merge branch 'master' of http://github.com/tsolucio/corebos
new function added get_log_history
Some translation in workflow module
Correct typeofdata on fields createdtime & modifiedtime.
Merge pull request #33 from playmono/master

Some translation in workflow module

Thanks :-)