Cleaned up double try/catch in the intent service
Fixed another version of the 2.3k+ week bug
Reconfigured the main layout
Removed force sync option from menu
Merge remote-tracking branch 'origin/wip/cookie' into wip/cookie