Fixing more wizard stuff -  cleaning up some string compares, wizard creates power, and trying out startActivityForResult
Merge remote-tracking branch 'origin/master'