added Qa Module
Merge https://github.com/cliffeby/mean

Conflicts:
	.bowerrc
	.csslintrc
	Procfile
	app/controllers/users.server.controller.js
	app/models/user.server.model.js
	bower.json
	config/env/all.js
	config/env/development.js
	config/env/production.js
	config/env/test.js
	config/express.js
	config/passport.js
	package.json
	public/config.js
	public/humans.txt
	public/modules/articles/articles.client.module.js
	public/modules/articles/config/articles.client.routes.js
	public/modules/core/config/core.client.routes.js
	public/modules/core/core.client.module.js
	public/modules/core/views/header.client.view.html
	public/modules/core/views/home.client.view.html
	public/modules/users/config/users.client.routes.js
	public/modules/users/users.client.module.js
	public/robots.txt
	server.js
Merge https://github.com/cliffeby/mean

Conflicts:
	.bowerrc
	.csslintrc
	Procfile
	app/controllers/users.server.controller.js
	app/models/user.server.model.js
	bower.json
	config/env/all.js
	config/env/development.js
	config/env/production.js
	config/env/test.js
	config/express.js
	config/passport.js
	package.json
	public/config.js
	public/humans.txt
	public/modules/articles/articles.client.module.js
	public/modules/articles/config/articles.client.routes.js
	public/modules/core/config/core.client.routes.js
	public/modules/core/core.client.module.js
	public/modules/core/views/header.client.view.html
	public/modules/core/views/home.client.view.html
	public/modules/users/config/users.client.routes.js
	public/modules/users/users.client.module.js
	public/robots.txt
	server.js
new qa
new qa
update