Re-added the separate Diary/Label screens for now

main.html
- Uncommented the diary button
- Replaced the icon and title from the unified diary button, back to the label button

www/templates/main.html

@@ -7,9 +7,9 @@
 <ion-tabs ng-class="tabsCustomClass()">
 
   <!-- Diary Tab -->
-  <!-- <ion-tab title="{{'main-diary' | translate}}" icon="ion-map" href="#/root/main/diary">
+  <ion-tab title="{{'main-diary' | translate}}" icon="ion-map" href="#/root/main/diary">
     <ion-nav-view name="main-diary"></ion-nav-view>
-  </ion-tab> -->
+  </ion-tab>
 
   <!-- Game Tab
   <ion-tab title="Goals" icon="ion-android-checkbox" href="#/root/main/goals">
@@ -22,7 +22,7 @@
   </ion-tab> -->
 
   <!-- New Unified Diary Screen -->       <!-- OLD INFINITE SCROLL::: icon="ios-checkmark-round" /// 'main-inf-scroll.tab'-->
-  <ion-tab title="{{'main-diary' | translate}}" icon="ion-map" href="#/root/main/inf_scroll">
+  <ion-tab title="{{'main-inf-scroll.tab' | translate}}" icon="ion-checkmark-round" href="#/root/main/inf_scroll">
     <ion-nav-view name="main-inf-scroll"></ion-nav-view>
   </ion-tab>