Merge branch 'master' of ssh://git.sip-router.org/sip-router

Arrggh. Need to clean up my working directory before xmas.
* 'master' of ssh://git.sip-router.org/sip-router:
  modules_s/timer: moved to modules folder