Initial Commit
Merge branch 'master' of https://github.com/Jaid/devrays.git

Conflicts:
	Devrays-android/assets/data/code.bin
	Devrays-android/gen/.gitignore
	Devrays-desktop/bin/app/jaid/devrays/Main.class
	Devrays-desktop/bin/data/code.bin
	Devrays-desktop/src/app/jaid/devrays/Main.java
	Devrays-meta/src/app/jaid/devrays/meta/code/CommandType.java
	Devrays-meta/src/app/jaid/devrays/meta/code/EventType.java
	Devrays-packer/src/app/jaid/devrays/packer/CodePacker.java
	Devrays-packer/src/app/jaid/devrays/packer/Main.java
	Devrays/bin/app/jaid/devrays/screen/editor/EditorMap.class
	Devrays/bin/app/jaid/devrays/screen/editor/data/Function.class
	Devrays/bin/app/jaid/devrays/screen/editor/ui/LogicUi$1.class
	Devrays/bin/app/jaid/devrays/screen/editor/ui/LogicUi$2.class
	Devrays/bin/app/jaid/devrays/screen/editor/ui/LogicUi$3.class
	Devrays/bin/app/jaid/devrays/screen/editor/ui/LogicUi$4.class
	Devrays/bin/app/jaid/devrays/screen/editor/ui/LogicUi$5.class
	Devrays/bin/app/jaid/devrays/screen/editor/ui/LogicUi$6.class
	Devrays/bin/app/jaid/devrays/screen/editor/ui/LogicUi$8.class
	Devrays/bin/app/jaid/devrays/screen/editor/ui/LogicUi$ToggleCardsButtonListener.class
	Devrays/bin/app/jaid/devrays/screen/editor/ui/LogicUi.class
	Devrays/bin/app/jaid/devrays/screen/menu/MenuScreen.class
	Devrays/src/app/jaid/devrays/screen/editor/EditorMap.java
	Devrays/src/app/jaid/devrays/screen/editor/data/Function.java
	Devrays/src/app/jaid/devrays/screen/editor/ui/LogicUi.java
	Devrays/src/app/jaid/devrays/screen/menu/MenuScreen.java