fixded merge
Merge branch 'master' of https://github.com/hera91/TymyReader.git

Conflicts:
	src/com/ph/tymyreader/TymyListActivity.java