Merge branch 'master' of https://github.com/awind/DRadio

Conflicts:
	app/src/main/java/com/awind/dradio/activity/PlayActivity.java
Merge branch 'master' of https://github.com/awind/DRadio

Conflicts:
	app/src/main/java/com/awind/dradio/activity/PlayActivity.java