change login order
Merge branch 'master' of github.com:spidermandl/Diary
add template edit