add assets
add log4j
Merge branch 'master' of https://github.com/rigelos/discuss.git