Merge pull request #103 from asv000/master

add settingsActivity, Implement geature lock
remove unused imports
use overflow menu
use icons for upload/refresh menu item