Added Quest Manager
Merge origin/master