some refactoring
remove windows file endings
merge
fix macosx build
merge
fix merge
include glew in sources, do not use as library
GL_ASSERT macro
add log
use logger
ASSERT and ENSURE macroses
minor fixes for xcode 4.5
platform macros for ios
enclose typedefs in base namespace
simplified json reader
sjson implement on streams
separate sjson internals
json fixes for msvc
fix glew and google-test for msvc
json write to string