Merge branch 'master' of git://github.com/citation-style-language/styles into develop

Conflicts:
	dependent/general-and-comparative-endocrinology.csl
	dependent/neuroscience-letters.csl
	neuroscience-letters.csl
display scale and type of map for maps, minor cleanup
Merge branch 'master' of git://github.com/citation-style-language/styles into develop
Merge remote-tracking branch 'upstream_csl_styles/master' into develop
add interviewer and medium to interview in bibliography
Merge branch 'develop'