Stand 13:05
Merge remote-tracking branch 'origin/master'

Conflicts:
	ex5/src/flappy_box/view/box_gl_drawable.cpp