Add required database roster queries
Merge branch 'master' of github.com:surevine/xmpp-profile-server

Conflicts:
	src/main/java/com/surevine/profileserver/db/jdbc/JDBCDataStore.java