added betayota branch to the auto-merge list
synchronization with ics branch
<video> ePub3 support (in progress)
added nanohttpd server
test httpd start
renaming: video server => data server
start video player
working video code
better video placeholder look
cleanup
range bytes
new branches
Merge branch 'master' into video
fbreader.ru => ru.fbreader.org
Merge branch 'master' into video
formatting
Merge branch 'master' into video
fixed NPE if cancel menu opened & closed too fast
InputStream.reset() support
Merge branch 'master' into video