OWASP Security measures implemented
-HTTPOnly Cookies, Session-timeout
-X-FRAME-OPTION
-URL encryption
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/WEB-INF/web.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/WEB-INF/web.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/WEB-INF/web.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/WEB-INF/web.xml
Merge remote-tracking branch 'origin/master'