contact list css height calc
Merge branch 'master' of https://github.com/dacappo/messenger

Conflicts:
	stylesheets/default.css