Added Settings Master/Detail flow page
Merge remote-tracking branch 'origin/master'