android
Merge branch 'gpu' of https://github.com/davidaq/ccplus into gpu

Conflicts:
	Makefile
	src/frame.cpp
	src/renderables/composition.cpp
oh those changes