Merge pull request #1 from catmadevel/master

various
Merge pull request #4 from mpetris/master

latest features and bugfixes
Merge branch 'master', remote-tracking branch 'githup/master'
Merge branch 'master', remote-tracking branch 'origin/master'
Merge remote-tracking branch 'mpetris/master'
Merge branch 'catma42'
new inline element
Merge branch 'master' into uima