fixes

fixes for scaling on android
Merge branch 'jrop1.0' of https://github.com/kenetkhoo/TeamBlue into jrop1.0

Conflicts:
	New Unity Project/Assets/Scripts/TitleScreenScript.cs
	New Unity Project/Library/ScriptAssemblies/Assembly-CSharp.dll
	New Unity Project/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	New Unity Project/Library/assetDatabase3
	New Unity Project/Library/metadata/16/16c7b7f50b6ac544e963be74370f51df
	New Unity Project/Library/metadata/20/2047650ea9fc2c347aeedbc562b6ab05
	New Unity Project/Library/metadata/25/259efe0f929d3c84bbedd287d8cae686
	New Unity Project/Library/metadata/48/48a84d8d8e046b0479af459c05d99e72
	New Unity Project/Library/metadata/56/56764ca73b91a6a4d971d39e9ec3c6df
	New Unity Project/Library/metadata/5e/5e1bd8c2f98d26740a3423c60597858e
	New Unity Project/Library/metadata/63/63e7c42e954749c4d902c7d38ebcc33a
	New Unity Project/Library/metadata/78/789e5407c129f8846bb04605ac9eecb5
	New Unity Project/Library/metadata/81/81269f497595dfd4194379167e8cb3f4
	New Unity Project/Library/metadata/88/88ff8238d4fb65749bbc04396c3b207e
	New Unity Project/Library/metadata/8c/8ceeebd4008093a4986325e9a7f47dbf
	New Unity Project/Library/metadata/95/955a16b509f72fe48b707af3e5446425
	New Unity Project/Library/metadata/a5/a580bfe044e0924429439a53179fc330
	New Unity Project/Library/metadata/aa/aa8f0ae17758a264eba00200a914871b
	New Unity Project/Library/metadata/b4/b4936cc753d20a04b9cb5cd120ba890e
	New Unity Project/New Unity Project-csharp.sln
	New Unity Project/New Unity Project.sln