overall mvc update
Merge branch 'master' of http://github.com/dacappo/messenger

Conflicts:
	index.php

overall update
:q