WL-1002 Add Make Site Page for Citations.
Also refactored so we aren't doing the work in the helper.

Conflicts:
	content-tool/tool/src/java/org/sakaiproject/content/tool/ResourceTypeLabeler.java
	content-tool/tool/src/java/org/sakaiproject/content/tool/ResourcesAction.java
	content-tool/tool/src/java/org/sakaiproject/content/tool/ResourcesHelperAction.java
WL-965 Provide UK copyright statuses.

Conflicts:
	content-tool/tool/src/bundle/right_en_GB.properties
WL-569 Add the ability to include addition instructions.

Conflicts:
	content-tool/tool/src/webapp/vm/resources/sakai_create_uploads.vm
WL-1050 Add text to webdav page about copyright
WL-1453 add (Webdav) to Upload-Download multiple resources
WL-1465 WL-1492

This fixes the bug that was introduced in:
http://jira.sakaiproject.org/browse/SAK-16672
when the property wasn't put in the correct .properties file. It probably doesn't need to be migrated to later branches as I think SAK-17038 removes the need to for this property.

Conflicts:
	content-bundles/resources/content_tr_TR.properties
WL-1544 Correct the fairuse URL.
WL-1567 Add a copyright option for Uni of Oxford.
WL-1559 Change Edit Details to Edit Details (Properties).
WL-1672 Copyright Information textbox
WL-1621 Add resources to secure sites.
Fix a right issue on FilePickerAction.java

There is no reason for this file to be executable
BSGAPP-50 Allow indent to come from style.
BSGAPP-1 - WP2.2 - Add new meta data fields
BSGAPP-2 - WP2.1 - Store meta data in sites
BSGAPP-3 - WP2.4 - Assign meta data to resources

WL-1955 PermissionException with metadata.json

The advisor checks content rights based on a reference, not an Id

WL-38 : Use properties to get Dublin Core group name

WL-2330 Support boolean metadata type.

This adds support for a boolean metadata type which can be used by Blavatnik for marking content as essential reading. I also refactored the JSON parser out into a helper so that it's easier to test the parsing of a config file.
BSGAPP-49 WP37 Generation of component subfolders

WL-2052 create blavatniks appears in drop box tool
WL-2047 actions menu has create blavatniks when not blavatnik site
WL-379: Localise Drop Box tool

WL-2178: Change 'Site Resources' which is displayed on the Drop Box main page
WL-2214 - mention that one can use a zip file on uplaod files page
WL-2209: Improve wording when assigning to groups created by Signup tool and appearing in other tools
WL-2222: Signup subgroup creation. Groups names are difficult to read and if too long, groups do not appear in Site Info at all
WL-2301: Resources tool is confused with Dropbox

Conflicts:
	content-tool/tool/src/webapp/vm/content/chef_resources_webdav.vm
	content-tool/tool/src/webapp/vm/content/sakai_resources_columns.vm
	content-tool/tool/src/webapp/vm/content/sakai_resources_list.vm