Cleanup
Cleanup
Merge pull request #16 from rustyswayne/master

Cleanup
.
Merge remote-tracking branch 'rosetta/master'

Conflicts:
	src/website/Config/ClientDependency.config