finish chapter 6
finish chapter 8
Merge branch 'master' of https://github.com/maruchen/trackstar

Conflicts:
	protected/models/Project.php
	protected/tests/unit/ProjectTest.php