Local
Merge branch 'master' of github.com:playitback/addressbook

Conflicts:
	lib/router.php