Transition 1 refined
Merge pull request #118 from paranoidmarv/master

Some fixes to journal
Test

fixes #119
Merge pull request #120 from Kiroshima/master

Test
Fixes Dialogue + Atlas
Merge branch 'master' of https://github.com/JohnMai/WhiteSharks

Conflicts:
	Assets/DialoguerOutput/Resources/chapter1.xml
	Assets/DialoguerOutput/Resources/dialoguer_data.xml
Updated atlas, added Alpha disclaimer
Merge pull request #122 from JohnMai/anthonylim

Updated atlas, added Alpha disclaimer
Added new font for web build, commented out 2 files

Added Lucida Grande font for building for the web (to fix an error of
unsupported data)
Commented out FileManager.cs and SceneManager.cs because of a web
player build error
Changed ProjectSettings data to add WhiteShark name
Merge pull request #123 from JohnMai/anthonylim

Added new font for web build, commented out 2 files