updates
Merge branch 'master' of github.com:agabert/rabota

Conflicts:
	Makefile
	include/rabota.mk