test
Merge pull request #1 from Clodo76/master

test
Merge pull request #2 from Clodo76/master

Isis
Merge branch 'master' of https://github.com/OsirisSPS/osiris-sps
Merge pull request #3 from berserker/master

test
Merge branch 'master' of https://github.com/OsirisSPS/osiris-sps
test edit
Merge pull request #4 from Clodo76/master

Migration
cleanup
Merge pull request #5 from Clodo76/master

migration
Merge pull request #6 from Clodo76/master

misc
Merge pull request #7 from Clodo76/master

misc
Merge pull request #8 from Clodo76/master

misc
boost upgraded to 1.54.0
includes
Merge branch 'master' of https://github.com/OsirisSPS/osiris-sps
Merge pull request #9 from Clodo76/master

misc
Merge branch 'master' of https://github.com/OsirisSPS/osiris-sps
boost 1.54 changes
Merge branch 'master' of https://github.com/OsirisSPS/osiris-sps