removed subversion setting
Merge remote-tracking branch 'origin/upgrade_sitemesh_reorg_filesystem' into upgrade_sitemesh_reorg_filesystem
Updates to API with some error checking and prevent duplicates from being created.
Merge remote-tracking branch 'origin/upgrade_sitemesh_reorg_filesystem' into 1.5.1-merge

Conflicts:
	.idea/workspace.xml