re-added Simperium PROPERLY; commented out code used by tender version of Simperium
re-added Splash objects; syncing somewhat works
Merge branch 'develop' into tender