IT"S API TIME
Merge branch 'master' of github.com:dan4ik95dv/housemanagement

Conflicts:
	tsj/views.py