option screen has control description
teleport hopefully working, no map texture yet
changes salesman dialog
Merge branch 'master' of https://github.com/annsimon/candyland

Conflicts:
	Candyland/Candyland/Data/GameConstants.cs
options added
Merge branch 'master' of https://github.com/annsimon/candyland
Merge branch 'master' of https://github.com/annsimon/candyland
Merge branch 'master' of https://github.com/annsimon/candyland
Merge branch 'master' of https://github.com/annsimon/candyland
level mistakes fixed
Merge branch 'master' of https://github.com/annsimon/candyland