version should be 1.4.6-SNAPSHOT
Merge branch 'master' of git://github.com/Netflix/exhibitor

Conflicts:
	gradle.properties
Merge pull request #118 from Randgalt/master

1.4.6-SNAPSHOT