Split out deployment specific settings, and added a bug report link.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Split out deployment specific settings, and added a bug report link.