ajax errors now displayed properly
removed incorrect db constraint
Merge branch 'master' of github.com:SergeantHawke/Steampunk

Conflicts:
	steampunk.mwb
	steampunk.mwb.bak