Added a listView of the proxies, and an icon for the application.
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/build.gradle
	app/src/main/res/layout/activity_main.xml