bug fix v1.1 for production
resolve mergr conflict
added notes,completed coding