.
Merge branch 'master' of https://github.com/salesnya/kodok_sales2

Conflicts:
	templates/admin/login/login.html