Edited Store Manager
Merge origin/master