#188 Correcting the way properties files are deployed. Note that the format of the properties.xml file is different and will need to be updated for existing projects.
Merge branch 'dev' of https://github.com/marklogic/roxy.git into dev
#193 Adding support for path fields
making a more precise path to find an extension's name during deploy
adding deploy rest command
adding install-xcc = (true|false) option
Merge branch 'dev' of https://github.com/marklogic/roxy into dev
#199 Collation wasn't being returned from the function that got it from the user
fixed issue #205 - roxy now removes content forests with numbers on the end
Improved self-test for MarkLogic 7
#208 fix deploying REST stuff with digest authentication
#188 On detecting the old properties format, error out and point the user to a wiki that explains what needs to be done.
#206 Fixing the ML7 test configuration for fields, so that the tests are correct and pass.
#206 updated default testing version to 7
Added configuration to include path fields in unit tests
#193 fixed implementation so that it reports the use of an unsupported feature on MarkLogic < 7.0-1
Bumping default server version to 7
Updating changelog
Updating the dev branch to version 1.6
Merge remote-tracking branch 'upstream/dev' into dev

Conflicts:
	deploy/test/data/ml7-config.xml
	deploy/test/test_server_config.rb
Fix for #210: new usage when running ml from roxy root