SQS-subjects work
sqs-subjects factory work
Merge origin/master

Conflicts:
	app/scripts/app.js