Use new SF hook

Change-Id: Ib357cc39c5bb62e164e93fdf4c3d7ddd834998a4
Fix hook registration
Update composer.json
Move functions
Merge branch 'master' of git://github.com/JeroenDeDauw/SemanticMaps
fix hook return value