NaCl compiling option
Merge branch 'master' of https://github.com/xzfc/ProjectTox-Core into xzfc-master

Conflicts:
	CMakeLists.txt