minor fixes
Merge branch 'master' of https://github.com/tr8n/tr8n_samples_welp_j2ee