Conflicts:
	CMakeLists.txt
	src/CMakeLists.txt
	third_party/luajit

https://github.com/mailru/tarantool/issues/20

The patch which removes the CPack-generated spec
and adds a proper spec for client, server and library
was done by Dmitry Simonenko.

Hand-port the patch to the master, since it's gone too
far away from the origin and merging it ends up in a mess.

Minor tweaks of the code as per a more thorough review of the 10k
patch which introduces C++ instead of Objective C.
No bugs found or fixed, only style changes.

Conflicts:
	src/CMakeLists.txt
	third_party/luajit

Conflicts:
	.gitmodules

Add comments, add documentation.

Conflicts:
	test/box/lua.result

Don't allow a mix of scalars and complex returns in Lua multireturn.
Allow a mix of tables and tuples in Lua multireturn table.

Conflicts:
	test/box/lua.result

Code review of cjson branch by Dmitry E. Oboukhov.
Hand-picking the changes since the original branch
is based on import of lua-cjson into Tarantool
revision tree, and this branch is based on a git
submodule.

This patch implements
https://blueprints.launchpad.net/tarantool/+spec/lua-cjson