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.
Style comments view with auto height of cells.
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