pull checkin
Merge branch 'chat-updates' of http://github.com/pakage/navajocoin into chat-updates

Conflicts:
	NavajoAnonBeta-qt.pro.user