Replace assertion with BuildConfig.DEBUG.
Move settings.xml to correct place, and fix hardcoded strings.
Fix references to xml/settings.xml now that it moved.
Add missing contentDescriptions.
Convert field to local
Update .gitignore from suggestion at http://stackoverflow.com/questions/16736856/what-should-be-in-my-gitignore-for-an-android-studio-project
fixed untracked files
Merge branch 'master' into cast

Conflicts:
	.idea/gradle.xml
	.idea/libraries/gridlayout_v7_19_1_0.xml
	.idea/vcs.xml
	DungeonSketch/DungeonSketch-DungeonSketch.iml
	DungeonSketch/src/main/res/values/strings.xml