solved merge conflict
edit readme and changelog
edit readme.doc, delete non-useful js from application.js&cardmanipulation js