Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/libraries/jsoup_1_7_3.xml
Improved icons for the app.