conf -> configuration
Add 'online_users' table
Give the online resource manager a database connection
Merge branch 'master' of github.com:buddycloud/buddycloud-server-java into issues/213

Conflicts:
	src/test/resources/org/buddycloud/channelserver/testing/jdbc/scripts/base.sql
Fix table creation
Add database methods for storing/retrieving presence data
Merge branch 'master' of github.com:buddycloud/buddycloud-server-java into issues/213

Conflicts:
	src/main/java/org/buddycloud/channelserver/db/jdbc/JDBCNodeStore.java
	src/main/java/org/buddycloud/channelserver/db/jdbc/dialect/Sql92NodeStoreDialect.java
Persist presence data to the database if requested
Remove debug
Wrap query
Formatting update
Extract 'user'
Merge branch 'issues/213' of https://github.com/surevine/buddycloud-server-java into surevine-issues/213

Conflicts:
	src/main/java/org/buddycloud/channelserver/Configuration.java
Merge branch 'surevine-issues/213'