Merge remote-tracking branch 'upstream/master'
Remove pods denpendence form project,fix some warnings.
Syntax change.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	iOS/samples/AVOSDemo/AVOSDemo/AVFileBasic.m
	iOS/samples/AVOSDemo/AVOSDemo/AVQueryBasic.m
Changelog.
Merge pull request #50 from ufosky/master

Changelog for 2.6.0.