cannot merge
Merge branch 'master' of github.com:melbreaker/rr_tutorial

Conflicts:
	bin/RssReader.apk
	bin/classes.dex
	bin/classes/mel/myapp/rssreader/MainActivity$RSSDataController.class
	bin/classes/mel/myapp/rssreader/MainActivity.class
	bin/resources.ap_