fix some bugs
Merge branch 'master' of https://github.com/justplay1/hackathon

Conflicts:
	Hackathon/src/com/hackathon/news/NewsFragment.java