Merge branch '9-napraviti-lako-filtriranje-timova-na-kalendaru' into 'master'

Merge branch '8-podrska-za-boje-na-kalendaru' into 'master'

Closes #8 and #9

See merge request kbr4/zsterminator!7

config/locales/bs.yml

@@ -7,6 +7,8 @@ bs:
       today: "Danas"
       next: "Sljedeća »"
       new_reservation: "Nova rezervacija" # TODO: Translate to Bosnian 
+      filter_by_team: "Filtriraj po timu"
+      all_teams: "Svi timovi"
     calendar:
       hours: "sati"
       delete_confirm: "Jeste li sigurni da želite izbrisati ovu rezervaciju?"
@@ -15,6 +17,7 @@ bs:
       network_error: "Greška prilikom brisanja rezervacije zbog problema s mrežom ili skriptom."
       edit: "Uredi"
       delete: "Obriši"
+      all_teams: "Svi timovi"
     # Keys for form and edit/new pages
     edit:
       title: "Uređivanje rezervacije"

config/locales/en.yml

@@ -52,6 +52,8 @@ en:
       today: "Today"
       next: "Next »"
       new_reservation: "New reservation"
+      filter_by_team: "Filter by team"
+      all_teams: "All teams"
     calendar:
       hours: "hours"
       delete_confirm: "Are you sure you want to delete this reservation?"
@@ -60,6 +62,7 @@ en:
       network_error: "Error deleting reservation due to a network or script issue."
       edit: "Edit"
       delete: "Delete"
+      all_teams: "All teams"
     edit:
       title: "Editing reservation"
       show: "Show this reservation"