feat(QLP): allow friends subdomain AND hiv domain
fix(QLP): can only have one route per resource
feat(QLP): logo is optional
chore(upgrade): upgrade angular file uploader to v1.0.1
fix(nonprofit-registration): fix upload in IE9
chore(behat): fix wording
chore(dev): allow for 192.168.*.* net
feat(iframe): add iframe for wrapping redirect domains
chore(CS): explicitly mark active bunner as nullable
chore(merge): merge branch 'master' into premium-configurator

Conflicts:
	app/config/routing.yml