super cool working layout
Merge branch 'master' of https://github.com/symptog/newsreader.git

Conflicts:
	bin/classes/com/example/newsreader/AddServer$UserLoginTask.class
	bin/classes/com/example/newsreader/AddServer.class
	bin/classes/com/example/newsreader/MainActivity.class
	bin/classes/com/example/newsreader/R$layout.class
	bin/classes/com/example/newsreader/R$menu.class
	bin/classes/com/example/newsreader/R$string.class
	bin/classes/com/example/newsreader/R$style.class
	bin/classes/com/example/newsreader/R$xml.class
	gen/com/example/newsreader/R.java