Travis CI: API documentation update at 2014-01-28 01:06:48 UTC.
[ci skip]
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Docs/AngelScriptAPI.h
	Docs/ScriptAPI.dox