Travis CI: API documentation update at 2014-03-13 08:41:02 UTC.
[ci package]
Merge remote-tracking branch 'upstream/master'

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