setup pages almost complete
Merge branch 'nick_live' into live

Conflicts:
	demo/css/setup.css