New buttons and stuff
Merge branch 'master' of https://github.com/anokta/CS7038

Conflicts:
	Assets/Scripts/DialogueSystem/DialogueEntry.cs