More tests
Merge branch 'master' into tanel-coverage

Conflicts:
	Makefile
	src/test/toggl_api_client_test.cc