DeletedWeb-Inf
Logout-buggy
Logout-buggy
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/view/RedisApplication.jsp