First version of the event discussion UI
Discussion boards

- First fully working version
- Create threads or create a thread attached to an event
- Add posts to threads / edit them / delete them
Discussions

- fully working version
- some improvements still possible (hiding discussion on demand, add/edit with ajax)
AJAX upgrade to the discussion board

- Quickpost without reloading the page with AJAX

- for page changes / adding posts show an animated spinner

- spinner div / styles available from every page (the div is located in the default layout and is hidden unless manually shown)
Thread creation if it doesn't exist for an event
SQL template changes
Merge branch 'develop' into feature/discussion

- Pivots, attributes, discussions hideable

Conflicts:
	app/Controller/EventsController.php
	app/webroot/css/main.css
First rework of the siteadmin role

- ADMIN org removed.

- Siteadmins are now identified by the perm_site_admin flag

- Siteadmins can now be of any organisation

- editing the regexp / whitelist rules can now be done by a special user with the perm_regexp_access in his/her role

- Executing a mass replace of attribute values based on the regexp rules cannot be initiated by a regexp/whitelist user, only by a site admin

- If the login page is reached without any users / roles defined they are automatically created (perviously it was only the user that was created)

- Org admins are restricted from assigning perm_site_admin, perm_sync and perm_regexp_access roles to users. This can only be done by a site admin.
First revision of the unified menu and XML upload

- centalising the side menu for easier maintainability

- XML upload of event(s) from the interactive interface
Merge branch 'develop' into feature/XML_and_UI
Further work on the UI

- reworked almost all of the side menues to be centralised

- Some fixes for the IOC export not handling two new-ish types correctly

- Some changes to the menues (including a few options that didn't exist before)

- rework of the popovers in some forms
Few more changes

- some views didn't have the menu element yet
Merge branch 'feature/roleChanges' into feature/XML_and_UI

Conflicts:
	app/Controller/UsersController.php
	app/View/Regexp/admin_add.ctp
	app/View/Regexp/admin_edit.ctp
	app/View/Regexp/admin_index.ctp
	app/View/Roles/admin_add.ctp
	app/View/Servers/add.ctp
	app/View/Servers/edit.ctp
	app/View/Servers/index.ctp
	app/View/Servers/pull.ctp
	app/View/Servers/push.ctp
files left off added
Small changes after merging the two feature branches

- Update to the representation of the new permission flags

- some small issues with the merge resolved
More changes to the discussion boards

- quote / event tags

- anonymised e-mail addresses
Merge remote-tracking branch 'origin/feature/XML_and_UI' into feature/discussion

- Also some improvements to the shadow attributes

- some minor UI changes

Conflicts:
	app/Controller/EventsController.php
	app/View/Elements/global_menu.ctp
	app/View/Layouts/default.ctp
Renamed the .sql file used to upgrade
Contextual comments

- Attributes now have a comment field
Some minor changes

- Contextual comments added to all imports (GFI, ThreatConnect, OpenIOC)

- Some minor fixes to OpenIOC exports and linebreaks in attributes