deploy.rb changed
500.html changed
Merge branch 'dev'

Conflicts:
	public/500.html