General updates
clean copy to github
Merge remote-tracking branch 'origin/qaQuiz' into qaQuiz

Conflicts:
	public/modules/qas/controllers/qas.client.controller.js
	server.js
Merge branch 'master' into qaQuiz
Merge branch 'newestmaster' into qaQuiz

Conflicts:
	public/modules/qas/controllers/qas.client.controller.js
	public/modules/quizzes/controllers/quizzes.client.controller.js
	public/modules/quizzes/views/edit-quiz.client.view.html
Merge branch 'qaQuiz'