bug fix version 1.1 for production
reslove merge conflict
added notes for feature set final