fix encoding
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/pytech/first/adapters/ItemAdapter.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/pytech/first/adapters/ItemAdapter.java