2nd
Merge branch 'alex-branch' into kk

Conflicts:
	Omikron/ProjectViewController.m