Fix for running Explorer 5.12 on JDK 6
Fix for running reports on JDK 6 (version of Rhino in JDK 6 is too old)
Simple editor fixes
merge with master
Fixed type string
Fix for deployment on certain platforms (e.g. JBoss)
Merge branch 'master' of github.com:Activiti/Activiti
Merge branch 'master' of git://github.com/Activiti/Activiti into 5.12.1

* 'master' of git://github.com/Activiti/Activiti:
  Fix for deployment on certain platforms (e.g. JBoss)
  Fixed type string
  Simple editor fixes
  Fix for running reports on JDK 6 (version of Rhino in JDK 6 is too old)
  Fix for running Explorer 5.12 on JDK 6