updating 1.5 label from dev to master
Fix #142
Merge pull request #218 from rlouapre/issue-142

Issue 142
Fix #164
Merge pull request #219 from rlouapre/issue-164

Fix #164
Accidentally commited to master when it should have gone to dev

Revert "Merge pull request #219 from rlouapre/issue-164"

This reverts commit 6d5b260d5516cad5c5796a54c854c4910d888750, reversing
changes made to a07477636dac44a939be36884f6c8697af084c2e.
Merge branch '1-7-0'

Conflicts:
	CHANGELOG.mdown
	deploy/lib/server_config.rb
1.7 release prep