Merge branch 'master'

Conflicts:
	project-cycle.php
	single.php