Updated setup file and added settings page
Worked on scanner
Merge branch 'master' of github.com:solewolf/wicker