Merge branch 'master' into develop
png in stead off gif
original css of tmf but with font-sizes disabled and new Helvetica style
overriding line-height in article paragraphs to test
tags/keywords size
spacing
added editwizards to projectfile
config for editwizards, first wizards to test
these are all the old editwizards, most of them still need to be rewritten
css styles for editors and tinymce
paths to editwizards, still need to fix some
applications file for new version
moved main js which contains paths into reach of tomcat (style dir is often excluded)
language
plural form serves for url
Merge branch 'develop' of github.com:elfuego/tacticalmediafiles into develop