scanning complete board
refactoring
Merge remote-tracking branch 'origin/master'

Conflicts:
	ArScrabble/app/app.iml