Fixed bug
Merge branch 'master' of github.com:meltmedia/cadmium into jboss-7-updates