Merged server api project in
Fixed package errors, added missing config/WebContent
Merge pull request #15 from ConchordanceProject/api

Api