anchor link za jobe
Merge branch 'origin/develop'
Merge branch 'origin/develop'
intro logged in
what is new front page
Merge branch 'origin/develop'

Conflicts:
	protected/views/person/view.php
	protected/views/project/view.php
	protected/views/site/index.php
Merge branch 'origin/develop'