Template GitHub Link
Merge remote-tracking branch 'origin/gh-pages' into gh-pages

Conflicts:
	items/Components/affix.html
	items/Components/alert.html
	items/Components/audioplayer.html
	items/Components/autocomplete.html
	items/Components/calculator.html
	items/Components/carousel.html
	items/Components/chart.html
	items/Components/collapse.html
	items/Components/dialog.html
	items/Components/drawer.html
	items/Components/dropdown.html
	items/Components/modal.html
	items/Components/panelbar.html
	items/Components/popover.html
	items/Components/scrollspy.html
	items/Components/slideshow.html
	items/Components/toggle.html
	items/Components/tooltip.html
	items/Components/treeview.html
	items/Components/videoplayer.html
	items/Components/window.html
	items/Controls/captcha.html
	items/Controls/colorpicker.html
	items/Controls/country.html
	items/Controls/creditcardnumber.html
	items/Controls/datatable.html
	items/Controls/datepicker.html
	items/Controls/editor.html
	items/Controls/language.html
	items/Controls/numericstepper.html
	items/Controls/password.html
	items/Controls/phones.html
	items/Controls/rating.html
	items/Controls/search.html
	items/Controls/select.html
	items/Controls/subscribe.html
	items/Controls/switch.html
	items/Controls/timepicker.html
	items/Controls/tree.html
	items/Controls/upload.html
	items/Controls/validator.html
	items/General/advertisement.html
	items/General/button.html
	items/General/buttongroup.html
	items/General/checkbox.html
	items/General/code.html
	items/General/combobox.html
	items/General/fieldset.html
	items/General/label.html
	items/General/list.html
	items/General/listbox.html
	items/General/map.html
	items/General/masked.html
	items/General/radio.html
	items/General/table.html
	items/General/textarea.html
	items/General/textbox.html
	items/General/thumbnail.html
	items/General/typography.html
	items/Modules/accordion.html
	items/Modules/avatar.html
	items/Modules/badge.html
	items/Modules/barchart.html
	items/Modules/breadcrumbs.html
	items/Modules/calendar.html
	items/Modules/clone.html
	items/Modules/diagram.html
	items/Modules/form.html
	items/Modules/grid.html
	items/Modules/icon.html
	items/Modules/image.html
	items/Modules/jumbotron.html
	items/Modules/medialist.html
	items/Modules/menubar.html
	items/Modules/navbar.html
	items/Modules/nextprevious.html
	items/Modules/notice.html
	items/Modules/pageheader.html
	items/Modules/pagination.html
	items/Modules/panel.html
	items/Modules/printing.html
	items/Modules/progress.html
	items/Modules/schedule.html
	items/Modules/sharing.html
	items/Modules/sitemap.html
	items/Modules/tabs.html
	items/Modules/tooltip.html
	items/Modules/totop.html
	items/Modules/well.html
Merge branch 'gh-pages' of https://github.com/kingdomcreation/WebMetaphors into gh-pages

Conflicts:
	items/General/advertisement.html
	items/General/button.html
	items/General/buttongroup.html
	items/General/checkbox.html
	items/General/code.html
	items/General/combobox.html
	items/General/fieldset.html
	items/General/label.html
	items/General/list.html
	items/General/listbox.html
	items/General/map.html
	items/General/masked.html
	items/General/radio.html
	items/General/table.html
	items/General/textarea.html
	items/General/textbox.html
	items/General/thumbnail.html
	items/General/typography.html
	items/Modules/accordion.html
	items/Modules/avatar.html
	items/Modules/badge.html
	items/Modules/barchart.html
	items/Modules/breadcrumbs.html
	items/Modules/calendar.html
	items/Modules/clone.html
	items/Modules/diagram.html
	items/Modules/form.html
	items/Modules/grid.html
	items/Modules/icon.html
	items/Modules/image.html
	items/Modules/jumbotron.html
	items/Modules/medialist.html
	items/Modules/menubar.html
	items/Modules/navbar.html
	items/Modules/nextprevious.html
	items/Modules/notice.html
	items/Modules/pageheader.html
	items/Modules/pagination.html
	items/Modules/panel.html
	items/Modules/printing.html
	items/Modules/progress.html
	items/Modules/schedule.html
	items/Modules/sharing.html
	items/Modules/sitemap.html
	items/Modules/tabs.html
	items/Modules/tooltip.html
	items/Modules/well.html