Changed license on a bundled software, since that software has changed licenses.
Changed license from GPLv2 to BSD 3-Clause with consent of all contributors to this software.
Merge branch 'master' of github.com:jdelacroix/simiam into 4555-sp13
Merge branch '4555-sp13' of github.com:jdelacroix/simiam into 4555-sp13