Merge branch 'ollieh-master'
Add new Files to CMakeLists.txt
Merge branch 'pull-33'
Merge branch 'pull-34'
Merge branch 'master' of https://github.com/Tox/jToxcore