converted to grunt project and broke up the setup form into includes
minor clean up
first working copy of quicksite to work off one source
small changes
Merge branch 'oneSource'

Conflicts:
	config/_array.php
	config/_backupArray.php
	css/arrows.png
	css/bullets.png
	css/compiled/global.css
	css/loading.gif
	css/setup.css
	images/iconFb.png
	images/iconGp.png
	images/iconIg.png
	images/iconPt.png
	images/iconSc.png
	images/iconTw.png
	images/scLogo.png
	js/jquery.nivo.slider-ck.js
	js/jquery.nivo.slider.js
	js/script.js
	scss/_bits.scss
	scss/_grid.scss
	scss/global.scss
	scss/libs/_normalize.scss
	scss/libs/nivoSlider.scss
	scss/libs/nivoTheme.scss
	scss/libs/spectrum.scss
	scss/setup.scss
	setup/_formProcessorBackUp.php
	setup/fonts/hero-webfont.eot
	setup/fonts/hero-webfont.svg
	setup/fonts/hero-webfont.ttf
	setup/fonts/hero-webfont.woff
	setup/images/shopCity.png
	setup/js/spectrum-ck.js
	setup/js/spectrum.js
	setup/phpmailer/PHPMailerAutoload.php
	setup/phpmailer/class.phpmailer.php
	setup/phpmailer/class.pop3.php
	setup/phpmailer/class.smtp.php
	setup/todo.txt
	uploads/logo.png