Missed a quote.
No more system themes and templates.
* Removed the custom and system directories that were separating the different themes and templates.
* Updated several files to work with this change.
Merge branch 'no-system-markup'

Conflicts:
	site/system/core/Controller.php
	site/themes/minimal/img/add-tab-button.png
	site/themes/minimal/img/arrow.png
	site/themes/minimal/img/background/button.jpg
	site/themes/minimal/img/background/menu-bg.jpg
	site/themes/minimal/img/background/pattern.jpg
	site/themes/minimal/img/background/sidebar.png
	site/themes/minimal/img/collect-img.png
	site/themes/minimal/img/collection-btn-img.jpg
	site/themes/minimal/img/collections-icon.png
	site/themes/minimal/img/download-img.png
	site/themes/minimal/img/icon/add_to_selection.png
	site/themes/minimal/img/icon/image_download.png
	site/themes/minimal/img/icon/label_resolution.png
	site/themes/minimal/img/new-collections-icon.png
	site/themes/minimal/img/preview-img.png
	site/themes/minimal/img/theme.php
Moved remaining theme and template files to remove system and custom folders.