dunno
Merge branch 'master' of https://github.com/tanel/kopsik

Conflicts:
	src/ui/osx/test2.project/TimeEntryEditViewController.xib
Updated UI