Change in sorting options in result screen,
Manage wifi AP in checks if wifi is enabled,
Remove space in ssid in use currently connected network button,
Group password check
Merge branch 'master' of https://github.com/jritter/VoterApp.git

Conflicts:
	VoterApp/res/values/strings.xml
Salt digest and password check