merge develop and resolve conflict

src/boot/after_store.js

src/lib/persisted_state.js

src/modules/statuses.js

src/modules/users.js

src/services/api/api.service.js

.../backend_interactor_service/backend_interactor_service.js

src/services/follow_manipulate/follow_manipulate.js