Updated configuration wizard to SAF2
Merge branch 'saf2' of https://github.com/maerduq/saf into saf2