add bean to do checks
Merge remote-tracking branch 'origin/master'
move rendering to jsp
use new bean
add more checks