sync 2014-01-26
Merge branch 'master' of https://github.com/yoshow/x-client-api

Conflicts:
	src/resources/javascript/core/x.cookies.js
	src/resources/javascript/core/x.date.js
	src/resources/javascript/core/x.js