Merge branch 'hotfix-2.1.31'
Capitalized Home ... it was killing my OCD.
Merge pull request #195 from Xen0ph0n/patch-1

Capitalized Home in global menu... it was killing my OCD.
Merge branch 'hotfix-2.1.32'
Merge branch 'master' of https://github.com/MISP/MISP
Merge branch 'hotfix-2.1.32'
Update to allow clean entry of Whitelist Items

Added non alpha delimiters hardcoded so no preg_match errors and entries in whitelist can be human redable w/out extra leading and trailing chars.
Update to allow clean entry of Whitelist Items

Updated this along with whitelist.php to allow for simple entry of names in the whitelist, this file will allow proper application of those blocked names to exported NIDS sigs.
Merge pull request #197 from Xen0ph0n/master

Update to allow clean entry of Whitelist Items
Update to the GFI import

- fixed an issue where a blacklisted value added through uloadattachments would break the import

- fixed the distribution level of attributes created by the GFI import always being your org only

- removed registry attributes that do not contain a malware sample or a dropped file in the value

- fixed a set of regular expressions dealing with the sanitisation of user names that would fail on user names consisting of more than one word

- added a few regular expressions
Merge branch 'hotfix-2.1.33'
Merge branch 'master' of https://github.com/MISP/MISP
Few minor tweaks
Merge branch 'hotfix-2.1.33'
Error When Exporting as IOC if not Site Admin 

Fixed Syntax error if not site admin.. also fix in event component which was comparing wrong values to establish ownership of event
Error When Exporting as IOC if not Site Admin

This was comparing the wrong value to the event org to determine org membership and thus $isMyEvent value for privileges for export of IOCs if not a site admin.
Merge pull request #1 from Xen0ph0n/patch-2

Error When Exporting as IOC if not Site Admin
Tweak to allow IOC Export of events you don't own but are shared
Merge pull request #199 from Xen0ph0n/patch-3

Issue Exporting Events as IOC's when not SiteAdmin
Merge branch 'master' into develop

Conflicts:
	INSTALL/MYSQL.sql
	app/Controller/EventsController.php
	app/Model/Attribute.php