Merge remote-tracking branch 'remotes/origin/1.2-wip-travis-ci' into HEAD

Conflicts:
	build/F2.json
	docs/app-development.html
	docs/container-development.html
	docs/extending-f2.html
	docs/f2js-sdk.html
	docs/index.html
	docs/sdk/classes/F2.App.html
	docs/sdk/classes/F2.AppConfig.html
	docs/sdk/classes/F2.AppManifest.AppContent.html
	docs/sdk/classes/F2.AppManifest.html
	docs/sdk/classes/F2.Constants.Css.html
	docs/sdk/classes/F2.Constants.Events.html
	docs/sdk/classes/F2.Constants.Sockets.html
	docs/sdk/classes/F2.Constants.Views.html
	docs/sdk/classes/F2.Constants.html
	docs/sdk/classes/F2.ContainerConfig.UI.Mask.html
	docs/sdk/classes/F2.ContainerConfig.UI.html
	docs/sdk/classes/F2.ContainerConfig.html
	docs/sdk/classes/F2.Events.html
	docs/sdk/classes/F2.Rpc.html
	docs/sdk/classes/F2.UI.Modals.html
	docs/sdk/classes/F2.UI.Views.html
	docs/sdk/classes/F2.UI.html
	docs/sdk/classes/F2.html
	docs/sdk/files/sdk_src_classes.js.html
	docs/sdk/files/sdk_src_constants.js.html
	docs/sdk/files/sdk_src_container.js.html
	docs/sdk/files/sdk_src_events.js.html
	docs/sdk/files/sdk_src_rpc.js.html
	docs/sdk/files/sdk_src_ui.js.html
	docs/sdk/index.html
	docs/sdk/modules/f2.html
	sdk/f2.no-third-party.js