Contact / Address / Conversation filtering
Merge branch 'master' of http://github.com/SDCDev/shadowcoin

Conflicts:
	src/qt/messagepage.cpp