checking for pretty-print option...
checking for pretty print option
Merge branch 'master' into development

Conflicts:
	ResxToJS/Implementation/ResxToJsConverter.cs
	ResxToJS/Options.cs
Check for duplicates.
Merge branch 'development' of https://github.com/opentable/ResxToJS into development