Fixed SaveSharedPreference call
Merge conflict
Fixed merge conflict part 2
Revert changes
Merge branch 'master' of https://github.com/MinionApp/minion