Remove google reader import step from register workflow (#499)
Merge remote-tracking branch 'upstream/master'

Conflicts:
	clients/android/NewsBlur/res/layout/activity_addsites.xml
Merge remote-tracking branch 'upstream/master'
Remove AddFollow activity from register workflow (#499)
Merge pull request #548 from manderson23/master

Android: Update register workflow