Merge branch 'dev'
fixed javascript bug
added leadership roles
updates roles table
updated guest page
removed extra roles
updated alert mechanism