+player
Merge branch 'Fedorov' of github.com:cybern223/kinoost into test

Conflicts:
	src/com/cyber/kinoost/adapters/ListAdapter.java
conflict