Fifth
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	src/ru/mihver1/android/yaph/db/ImageStorage.java
	src/ru/mihver1/android/yaph/gui/PortraitRowAdapter.java
	src/ru/mihver1/android/yaph/gui/PortraitRowModel.java