boom
Merge branch 'master' of https://github.com/pavel-shpilev/nab-iday

Conflicts:
	api.py
	views.py