Fixed deleted file
Merge branch 'feature-commentview' of https://github.com/opfo/app into feature-commentview

* 'feature-commentview' of https://github.com/opfo/app:
  Fixed deleted file

Conflicts:
	Code Stream/OPFUserProfileViewController.m
Merge branch 'feature-commentview' of https://github.com/opfo/app into feature/styling

* 'feature-commentview' of https://github.com/opfo/app:
  Fixed deleted file
Change comment header style, fix Image linking.
Fix wrong background image being used.

Signed-off-by: Aron Cedercrantz <aron@cedercrantz.se>
Style comments view with auto height of cells.
Refactor identifier to OPFModel and hash and isEqual methods
Merge branch 'master' of https://github.com/opfo/app
Merge branch 'master' of https://github.com/opfo/app into feature/styling-comments-view

* 'master' of https://github.com/opfo/app: (38 commits)
  Refactor enums Prefixing kOPF
  Bug fix: Search Bar is scrolled back when returning to the QuestionsView
  Tidy up update queries
  Add a commented out spec for json conversion
  Fix a possible crash when not in DEBUG mode.
  Fix internal inconsistency problem.
  Fix search header not being hidden by default.
  Organize -[OPFQuestionsViewController viewDidLoad].
  Enable showing the question body in the question cell.
  Fix question cell label not being sized correctly.
  Add sidebar view.
  Changed how newly added comments and posts are updated in the view
  Change so we can refresh the shown question.
  Clean up unused code
  Java script is loaded after height calculation
  Xcode project file spring cleaning.
  Xcode project file spring cleaning.
  Add text to a pragma mark.
  Fix cell highlighting.
  Changed how newly added comments and posts are updated in the view
  ...

Conflicts:
	Code Stream.xcodeproj/project.pbxproj
	Code Stream/OPFCommentsViewController.m
	Code Stream/SingleQuestionPreviewCell.xib
Fix display name's label length.
Merge branch 'feature/styling-comments-view'

* feature/styling-comments-view:
  Fix display name's label length.
  Style comments view with auto height of cells.
  Change comment header style, fix Image linking.
  Fixed deleted file
Add user display name to index string
Merge branch 'master' of https://github.com/opfo/app
Fix not settings the adjusted color.

Signed-off-by: Aron Cedercrantz <aron@cedercrantz.se>
Change default background color to gray.

Signed-off-by: Aron Cedercrantz <aron@cedercrantz.se>
Add vote up/down selected state images.

Signed-off-by: Aron Cedercrantz <aron@cedercrantz.se>
Add gradient to sidebar of comment cell.
Merge branch 'master' of https://github.com/opfo/app

* 'master' of https://github.com/opfo/app:
  Add user display name to index string
  Fix display name's label length.
  Refactor identifier to OPFModel and hash and isEqual methods
  Style comments view with auto height of cells.
  Refactor enums Prefixing kOPF
  Bug fix: Search Bar is scrolled back when returning to the QuestionsView
  Tidy up update queries
  Add a commented out spec for json conversion
  Clean up unused code
  Change comment header style, fix Image linking.
  Java script is loaded after height calculation
  Resizing with SyntaxHighlighting plus special bugs
  Insert content directly into html string
  TableCell resize according to HTML content
  Fixed deleted file
  Ran bundle install
  Ran pod install

Signed-off-by: Aron Cedercrantz <aron@cedercrantz.se>

Conflicts:
	Code Stream.xcodeproj/project.pbxproj
	Code Stream/OPFSearchBarHeader.m
Merge branch 'master' of https://github.com/opfo/app into feature/styling-comments-view

* 'master' of https://github.com/opfo/app:
  Add vote up/down selected state images.
  Change default background color to gray.
  Fix not settings the adjusted color.
  Add user display name to index string
  Refactor identifier to OPFModel and hash and isEqual methods
  Fix wrong background image being used.
Fix a failing spec.

- The tests will not assert instead as the test target isn’t blocking
assertions.

Signed-off-by: Aron Cedercrantz <aron@cedercrantz.se>