fixing bugs in manage section
Merge origin/master