Fixing a broken test.
Merge branch 'mysql-tagging' of https://github.com/jacksingleton/securedrop
Merge branch 'master' of https://github.com/freedomofpress/securedrop

Conflicts:
	.gitignore
	securedrop/example_config.py
	securedrop/test.py
	setup_ubuntu.sh
added iptables rule for ntp
removes validation for authenticated tor hidden service users
added localhost to localhost udp iptables rules for monitor server
Merge pull request #266 from dolanjs/dolanjs-ATHS-user-validation-fix

* closes #266
* hotfix
Merge branch 'ntp-iptables-rule' of https://github.com/dolanjs/securedrop into dolanjs-ntp-iptables-rule
Merge pull request #264 from dolanjs/ntp-iptables-rule

* closes #264
* hotfix
Fix typo in x-xss-protection header
Merge branch 'master' of https://github.com/freedomofpress/securedrop

Conflicts:
	securedrop/crypto_util.py
	securedrop/db.py
	securedrop/journalist.py
	securedrop/store.py
	securedrop/test.py
Merge branch 'master' into mysql-tagging

Conflicts:
	securedrop/db.py
	securedrop/example_config.py
	securedrop/journalist.py
	securedrop/store.py
	securedrop/test.py