Merge pull request #1 from sehraf/master

db update
working filter resolving to login.jsp if not logged in
Merge remote-tracking branch 'upstream/master'