added the files that are needed, and make the changes that where form the server
Merge branch 'master' of https://github.com/alsocollective/kayapo