Gradle chenges

Change gradle and add edit text to OptionList
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/playlist/playlist_generator/MainActivity.java
	src/main/res/layout/activity_main.xml
	src/main/res/layout/selected_item.xml