Test merge
Merge branch 'master' of github.com:naio/Robbie

Conflicts:
	include/CVBitmap.h
	include/CVConverter.h
	include/CVImporter.h
	include/IOBuffer.h
	include/IOException.h
	include/RobbieSDK.h
	include/UIWindow.h
	src/CVBitmap.cpp
	src/CVConverter.cpp
	src/CVImporter.cpp
	src/IOBuffer.cpp
	src/IOException.cpp
	src/UIWindow.cpp