Fixed bug that feed of unfriended person was deleted (UserController.php)
testcommit
beautified implementations and comments
fixed bug resulting in _isSubscribed being always false
fixed minor bug
XMerge branch 'Jan' into vorprojekt

Conflicts:
	classes/Xodx/PersonController.php
	classes/Xodx/PushController.php
	classes/Xodx/UserController.php