Merge branch 'raysmond'
Basic friend functionality.
Fix my misunderstandings of the architecture.
Merge branch 'raysmond'

Conflicts:
	arch/controllers/PostController.php
Merge branch 'master' into raysmond