Merge pull request #55 from danielpunkass/codeSigningFix

Code signing fixes
Eliminated Xcode 6.1 compiler warnings
Bugfix: Make sure that Movies icon is displayed on Yosemite. Icon is missing on 10.10, so we need to ship our own.
Merge branch 'development' of github.com:iMediaSandboxing/iMedia into development
PhFacebook: Address warnings in Xcode 6.1
Bugfix: Removed baseline offset, because it looked wrong for at least the last to OS versions
Made defaultAppearance method public (for convenience)
Bugfix: When filtering the objects, make sure that objectCountString displays the correct thing.
Merge commit 'fa3f80c4a218c9882cf60b762cb173c45a55f742' into sandboxing

* commit 'fa3f80c4a218c9882cf60b762cb173c45a55f742':
  Bugfix: When filtering the objects, make sure that objectCountString displays the correct thing.
  Made defaultAppearance method public (for convenience)
  Bugfix: Removed baseline offset, because it looked wrong for at least the last to OS versions
  PhFacebook: Address warnings in Xcode 6.1
  Bugfix: Make sure that Movies icon is displayed on Yosemite. Icon is missing on 10.10, so we need to ship our own.
  Eliminated Xcode 6.1 compiler warnings

Conflicts:
	IMBFSEventsService.m
	IMBFileSystemObserver.m