first version
Remove <service> and modify the implementation a bit
Divide into api and impl projects
Clean up a little
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore