Add settings page #2
CS fix #2
Fix unit-test after changing actions #2
Remove duplicate function add on settings page
Merge conflict
Merge pull request #10 from x-team/issue/2

Add settings page closes #2