Merge pull request #12 from 410-VS/master

sync with group
fixed reset map bug related to button visibility
Merge pull request #46 from AravAlexander/master

fixed reset map bug that effected button visibility issues
Merge pull request #5 from 410-VS/master

update