fixed (?) spaces problem with apache commons commandline
Merge branch 'hotfix/spaces_iconv'
Merge branch 'master' of ssh://github.com/lablita/ridire-cpi