Conflicts:
	build/lib/versions.txt
	src/java/org/jivesoftware/openfire/nio/ClientConnectionHandler.java
	src/java/org/jivesoftware/openfire/nio/NIOConnection.java
	src/java/org/jivesoftware/openfire/spi/ConnectionManagerImpl.java

fixed encrypted properties containing xml escaped data not saved correct...

Encrypted properties containing data that needs xml escaping (eg a database password containing '&') are encryped in escaped form but decryption uses them directly. Encrypted properties do not need xml escaping.

Eg:
1. Install an mysql connection with the password 'pass&word'; password is saved as pass&word in properties.xml
2. Launch openfire
-> mysql connection is established correctly and password is now stored in encrypted form.
4. Restart openfire
5. Openfire startup fails due to incorrect database password (pass&word) is used.

Improvement of OF-69: Add "Groups user belongs to" column to the User

Summary page

OF-69: Add "Groups user belongs to" column to the User Summary page

OF-842: Additional properties in User Properties view

OF-754: Lock out user option works incorrectly in some cases

Fixed: OF-841 Add a note about UAC to the Installation Guide

User service plugin update to 2.0.2

- Fixed the problem with backward compatibility to user service 1.*

User Service plugin update to 2.0.1

- Fixed the problem that authentication type was not saved

User Service Plugin update to 2.0.0

- New restfull API (see readme). The plugin is backward compatible.
- Added new requst to get all or specific users
- The user is now extendible with key / values properties
- Added new requst to get roster entries of a specific users
- Added new requst to get group names of a specific users
- Added new request to add user to a group or remove a user from a group

MUC Service Plugin update to 0.2.3

- Bug fix: Unable to join groupchat 

Fixed: org.xmpp.packet.JID and JID String was mixed up.

MUC Service Plugin update to 0.2.2

- Room user roles can now be added and removed individually

OF-840 BOSH <stream:features> does not include <register/>

OF-483 - JDBCUserProvider hardcodes searchSQL

Update StatsAction.java

The Server traffic statstics in quick stats are incorrect and inconsistent compared with All Reports page.
The problem is in the calculation of Low and High Values.
The StatsViewer.getMin() and getMax() will return two values for high and low for server_bytes_in and server_bytes_out respectively.
The StatsAction.getLowAndHigh(String key,  long[] timePeriod) does not take that into account and always precesses the first element in the array. Modified so that it sums the values of all the elements of the array.

OF-839 Forwarded extension should not overwrite extension namespaces of ...

Allow for custom lib and conf file placement. Jira OF-838

Bug: properties in openfire.xml not properly loaded in setup

MUC Service Plugin update to 0.2.1

- Creation and modification dates, are now optional
- Room user roles, are now optional
- Bug fix: As persistent specified room, will be now saved to DB