Merge branch 'master' into platfrom
Added more Graphics stuph
Merge branch 'Android' into platfrom
Window restructuring
Merge remote-tracking branch 'origin/platfrom' into Android

Conflicts:
	src/Platform/Graphics.cpp