#6201 working on new structure type, apis, template field


Former-commit-id: d187aa9ee72f1a3400580bf7875ea265f02695b5
#6201 bad file


Former-commit-id: fe989e402c0641079f40e1fc9304a62f1d18338a
#6201 upgrade task, custom field title and redirect, some polish


Former-commit-id: c7bca916a499b32b2916299a3839942799f4230c
Merge branch #6201 'master' of https://github.com/dotCMS/dotCMS into issue-6201-htmlpage-as-content


Former-commit-id: 50728ffadd3adae77b90a34ebf4f68142e681453
Merge branch 'master' of https://github.com/dotCMS/dotCMS into issue-6201-htmlpage-as-content


Former-commit-id: 8ee8a3c07b5dd3fe67367e26c730421b82d284a6
#6201 cache ttl custom field


Former-commit-id: 7be67b0432e4abf9f3df87968f83d4f3bd0683b9
Merge branch #6201 'master' of https://github.com/dotCMS/dotCMS into issue-6201-htmlpage-as-content


Former-commit-id: 791843a5a10fe4a1607be874cb4ea871e7e99138
#6201 site browser almost working


Former-commit-id: 6da4e7408853585e01a53db71e32ddb7d2c6c73c
#6201 bug fixes, all over host and referer on new htmlpage asset


Former-commit-id: 08ee9def078c6e7a0cda789ed1731292e351c896
Merge branchi #6201 'master' of https://github.com/dotCMS/dotCMS into issue-6201-htmlpage-as-content


Former-commit-id: a9fdb26ff1f746c4c8b503b463d4226c59c725d3
#6201 edit mode starting to work


Former-commit-id: de3a7e3cea241272379aaf15072e9c8d16e08098
Merge branch #6201 'master' of https://github.com/dotCMS/dotCMS into issue-6201-htmlpage-as-content


Former-commit-id: 8609d61ae1956307e4a778dadd252bb6630be1fb
#6201 edit mode working


Former-commit-id: 6a7b17c8204a009072e572f53d84259da83d1aad
Merge branch 'master' #6201 of https://github.com/dotCMS/core into issue-6201-htmlpage-as-content
#6201 legacy page migration to content
Merge branch 'master' #6201 of https://github.com/dotCMS/core into issue-6201-htmlpage-as-content

Conflicts:
	src/com/dotmarketing/util/TaskLocatorUtil.java
Merge branch 'master' #6201 of https://github.com/dotCMS/core into issue-6201-htmlpage-as-content
#6201 permission & default type
#6201 navtool & folder ops on site browser
#6201 site browser move and rename