SYNR-736
Merge branch 'develop' into SYNR-736
SYNR-614 addressing deprecation of certain methods relating to old entity types
SYNR-658
SYNR-677 fix typo in query documentation
Merge pull request #156 from brian-bot/develop

three issues for R-1.4-0
Merge branch 'develop' into SYNR-736

Conflicts:
	man/PaginatedResults.Rd
	man/synapseFileTransfer.Rd
Merge branch 'develop' into SYNR-736
Merge pull request #157 from brucehoff/SYNR-736

Synr 736
Merge branch 'develop' into SYNR-736