FileCache: Change log level to ERROR

Since it is an error even though it isn't vital for it to continue.
Merge branch 'master' into store-api-results
Rename MainApplication to App
Merge remote-tracking branch 'origin/master' into store-api-results

Conflicts:
	App/src/com/dozuki/ifixit/App.java
	App/src/com/dozuki/ifixit/model/dozuki/Site.java
	App/src/com/dozuki/ifixit/model/search/GuideSearchResult.java
	App/src/com/dozuki/ifixit/model/search/TopicSearchResult.java
	App/src/com/dozuki/ifixit/ui/FavoritesActivity.java
	App/src/com/dozuki/ifixit/ui/GuideItemView.java
	App/src/com/dozuki/ifixit/ui/guide/StepEmbedFragment.java
	App/src/com/dozuki/ifixit/ui/guide/create/ChooseBulletDialog.java
	App/src/com/dozuki/ifixit/ui/guide/create/GuideIntroWizardModel.java
	App/src/com/dozuki/ifixit/ui/guide/create/wizard/GuideTitleFragment.java
	App/src/com/dozuki/ifixit/ui/guide/view/TeardownsActivity.java
	App/src/com/dozuki/ifixit/ui/login/OpenIDActivity.java
	App/src/com/dozuki/ifixit/ui/topic_view/TopicViewFragment.java
	App/src/com/dozuki/ifixit/util/UrlImageGetter.java
	App/src/com/dozuki/ifixit/util/Utils.java
	App/src/com/dozuki/ifixit/util/api/Api.java
Rename MainApplication to App
Merge remote-tracking branch 'origin/master' into authentication-with-account-manager

Conflicts:
	App/src/com/dozuki/ifixit/App.java
	App/src/com/dozuki/ifixit/model/search/TopicSearchResult.java
	App/src/com/dozuki/ifixit/ui/FavoritesActivity.java
	App/src/com/dozuki/ifixit/ui/WebViewFragment.java
	App/src/com/dozuki/ifixit/ui/auth/LoginFragment.java
	App/src/com/dozuki/ifixit/ui/auth/RegisterFragment.java
	App/src/com/dozuki/ifixit/ui/guide/StepEmbedFragment.java
	App/src/com/dozuki/ifixit/ui/guide/create/GuideIntroWizardModel.java
	App/src/com/dozuki/ifixit/ui/guide/create/wizard/GuideTitleFragment.java
	App/src/com/dozuki/ifixit/ui/guide/view/GuideViewAdapter.java
	App/src/com/dozuki/ifixit/ui/topic_view/TopicViewFragment.java
	App/src/com/dozuki/ifixit/util/CaptureHelper.java
	App/src/com/dozuki/ifixit/util/JSONHelper.java
	App/src/com/dozuki/ifixit/util/api/Api.java
Api: Add underscore in between key and userid

I don't expect anybody to look at the key but I guess it's a
good idea to have it in there just for good measure.
Bump version code for analytics fix
Merge store-api-results (#185) into master

Cache API responses for offline browsing

This adds a cache for API responses so the user can browse content offline
assuming that it was previously viewed with internet available. The
current implementation stores the JSON responses as files in the cache
directory. This was preferable to using a database because it is faster
and the storage space shows up under "Cache" rather than "App Data" so it
can be cleared independently from the user's stored data.

Note: This is different than offline storage of guides because the guides
and images are not stored in a permanent location.
Account preferences: Remove TODO

We probably won't ever want to use this to display preferences
so we shouldn't leave it as a TODO.
Merge remote-tracking branch 'origin/master' into offline-guides

Conflicts:
	App/src/com/dozuki/ifixit/model/search/TopicSearchResult.java
	App/src/com/dozuki/ifixit/ui/FavoritesActivity.java
	App/src/com/dozuki/ifixit/ui/GuideItemView.java
	App/src/com/dozuki/ifixit/util/UrlImageGetter.java
	App/src/com/dozuki/ifixit/util/api/Api.java
Merge authentication-with-account-manager (#188) into master

AccountManager Integration

This adds AccountManager integration so iFixit accounts are registered
with the system. This will allow us to use the SyncService framework to
do a lot of the heavy lifting for background syncing of offline guides.
This shouldn't have any effect on the user experience other than having
the account show up in the settings menu.

Conflicts:
	App/src/com/dozuki/ifixit/util/api/Api.java
Merge remote-tracking branch 'origin/master' into offline-guides

Conflicts:
	App/src/com/dozuki/ifixit/util/api/Api.java