Made the DB update work

It's a hack but i couldn't do it to work through the JS
fixed conflict

Conflicts:
	streamAlert/WebContent/view.jsp