refactoring
Merge branch 'master' of github.com:j4velin/WiFi-Automatic

Conflicts:
	build.gradle