Replace this app with just a  sails app.
Merge branch 'sub-master'

Conflicts:
	Gruntfile.js
	api/controllers/HomeController.js
	api/controllers/MailchimpController.js
	api/policies/isAuthenticated.js
	app.js
	assets/favicon.ico
	assets/fonts/glyphicons-halflings-regular.eot
	assets/fonts/glyphicons-halflings-regular.svg
	assets/fonts/glyphicons-halflings-regular.ttf
	assets/fonts/glyphicons-halflings-regular.woff
	assets/images/fb.png
	assets/images/message_icon.png
	assets/images/sad-face.png
	assets/images/smiley-face.png
	assets/images/twitter.png
	assets/images/webnified_logo.png
	assets/images/wink-face.png
	assets/js/app.js
	assets/js/bootstrap.js
	assets/js/logging.js
	assets/js/sails.io.js
	assets/js/socket.io.js
	assets/linker/js/subscribe.js
	assets/linker/styles/style.css
	assets/robots.txt
	assets/styles/bootstrap-theme.css
	assets/styles/bootstrap-theme.css.map
	assets/styles/bootstrap-theme.min.css
	assets/styles/bootstrap.css
	assets/styles/bootstrap.css.map
	assets/styles/bootstrap.min.css
	config/400.js
	config/403.js
	config/404.js
	config/500.js
	config/adapters.js
	config/bootstrap.js
	config/controllers.js
	config/cors.js
	config/csrf.js
	config/i18n.js
	config/local.js
	config/locales/_README.md
	config/locales/de.json
	config/locales/en.json
	config/locales/es.json
	config/locales/fr.json
	config/log.js
	config/policies.js
	config/routes.js
	config/session.js
	config/sockets.js
	config/views.js
	config/webnified-config.js
	package.json
	views/403.ejs
	views/404.ejs
	views/500.ejs
	views/home/index.ejs
	views/layout.ejs