+rept constructor
Merge origin/master

Conflicts:
	protected/controllers/PersonController.php
	protected/controllers/PhotoloaderController.php
	protected/views/person/view.php