add merge dependency
initial api implementation
Karma to only use test/client
Merge pull request #27 from rtfeldman/feature-apis

Feature apis