Update
Merge branch 'master' of https://github.com/satoruhiga/ofxLayer

Conflicts:
	src/ofxLayer.h
	src/ofxLayerManager.cpp
	src/ofxLayerManager.h