Updated the Stm section of the user guide
Merge branch 'master' into jdk7