Few small uncommitted changes from Macbook
Merge branch 'master' of https://github.com/jamesalliban/Cell

Conflicts:
	cell_server/src/TestApp.cpp
few uncommitted commits from Macbook