Change badge button to edit icon.
Update .gitignore, more comprehensive ignores.
Update for Android Studio 0.6
Fix .idea/workspace.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	ScoreKeep.iml
	build.gradle
	gradle/wrapper/gradle-wrapper.properties