Merge remote branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	src/com/graham/makewifi/BTConfig.java