MEGALINT
Merge branch 'master' of github.com:Vayner/Spotipower

Conflicts:
	app/src/main/java/com/enderwolf/spotipower/adapter/ServerListAdapter.java
	app/src/main/res/layout/fragment_mini_player.xml