* django1.7: (102 commits)
Beginning fix of rss_feeds unit tests.
Fixing unit test for profile app and signup.
Remove highlights count when it reaches zero.
Android v10.1b1.
Stubbing in profile tests.
Adding nginx.local.conf
Adding original text and original story to API docs.
#1282 Adding feed to root folder
#1319 In app and external browser options
Adding a smarter wakeup for real-time to handle cases where a laptop is re-opened but real-time is not immediately reestablished.
#1348 (scroll indicators theme)
#1344 (search loses focus)
#1335 Auto theme option for OS level dark mode
Fixing signup flow.
#1347 Show pager with stories after using the intel trainer and refreshing
#1272 Load HTML in comments
New icon for Infrequent Site Stories.
Allowing selection in private notes.
Autoresizing private notes field.
For #1035: Adding private notes to saved stories.
...
