Feeds use database when offline
Merge branch 'master' of https://github.com/sihrc/MobileProto-Lab5

Conflicts:
	.gitignore