removing nh-pages from master
synchronizing with original repository
Add Security filters
Javadoc
Merge branch 'master' into dev