fix feedback manager + feedback manager question
fix conflig
fix
Merge pull request #42 from HoangThiTuanDung/master

Fix feeback manager question + feedback manager