login template finished
Merge remote-tracking branch 'bardia/master'