Merge branch 'refs/heads/master' into gh-pages

Conflicts:
	assets/css/app.css
	assets/js/foundation/app.js
	assets/mustache/feed-item.mustache
	assets/sass/_module-prompt.scss
	assets/sass/_module.scss
	update.html
Merge branch 'refs/heads/master' into gh-pages

Conflicts:
	assets/css/app.css
	assets/js/foundation/app.js
	assets/mustache/feed-item.mustache
	assets/sass/_module-prompt.scss
	assets/sass/_module.scss
	update.html
juneo style updates and commercial ad examples
added classified ad to explore page