Fixed Some Bugs which stopped it from building.

- Renamed CameraFavourites.java to CameraFavouritesActivity.java.
- Added the Filter Bar to the Favourites List.
Merge remote-tracking branch 'origin/master' into design