whistler-rest first commit
Merge branch 'master' of https://github.com/syedfarhanali/Whistler

Conflicts:
	.project