Merge branch 'upstream/master'

Conflicts:
	box2dbody.cpp
	box2dbody.h
Merge branch 'origin/gdev'