changes to .gitignore
Merge branch 'dev3'

Conflicts:
	.gitignore
add extra column for unacknowleged events in raidalarms
remove extra { in javascript