devise views working
merge master