password encrypt , layout, erb ti haml changes included