changed filereader to take in filepath as string
Fixed possible problems in InputCommon
renamed default shaders, united esText.frag and Text.frag
Merge remote-tracking branch 'origin/feature/overhaul' into feature/overhaul
fixed text when text is in one row
Having good hopes with version 130, althrough generates some "deprecated" warnings
fixed text shader (could work on android too)
Cleaned default- and testscene.
Fix android tap motion
Merge branch 'feature/overhaul' of https://github.com/Team-Innis/UtH-Engine into feature/overhaul
Removed ES definitions from shader-files. Code now auto generates them.
More testscene cleaning.
Merge branch 'feature/overhaul' of https://github.com/Team-Innis/UtH-Engine into feature/overhaul
render texture now clears itself on initialize
Merge branch 'feature/overhaul' of https://github.com/Team-Innis/UtH-Engine into feature/overhaul
Added a hack to draw the tilemap without breaking other batched objects
Add tilehack to android build
Added functions to add and set text as string instead of wstring, converts to wstring
Merge branch 'feature/overhaul' of https://github.com/Team-Innis/UtH-Engine into feature/overhaul
Merge branch 'feature/overhaul' into develop

Conflicts:
	src/Engine/DefaultScene.cpp