changes for production
Merge remote-tracking branch 'origin/master'

Conflicts:
	test/HMACSpec.scala
	test/SourceSpec.scala
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/Nodes.scala
	app/controllers/stack/SecurityActions.scala