Some clean up. Managing the settings activity. using search from Action Bar
Adding untracked files