diff --git a/DroidRage/externalSrc/com/doomonafireball/betterpickers/calendardatepicker/CalendarDatePickerDialog.java b/DroidRage/externalSrc/com/doomonafireball/betterpickers/calendardatepicker/CalendarDatePickerDialog.java
index 777c02c2..5044da6a 100644
--- a/DroidRage/externalSrc/com/doomonafireball/betterpickers/calendardatepicker/CalendarDatePickerDialog.java
+++ b/DroidRage/externalSrc/com/doomonafireball/betterpickers/calendardatepicker/CalendarDatePickerDialog.java
@@ -44,6 +44,7 @@
 import android.widget.TextView;
 
 import com.doomonafireball.betterpickers.Utils;
+import com.meetingninja.csse.R;
 import com.nineoldandroids.animation.ObjectAnimator;
 
 /**
diff --git a/DroidRage/externalSrc/com/doomonafireball/betterpickers/calendardatepicker/SimpleMonthView.java b/DroidRage/externalSrc/com/doomonafireball/betterpickers/calendardatepicker/SimpleMonthView.java
index fe369ff1..0574be6c 100644
--- a/DroidRage/externalSrc/com/doomonafireball/betterpickers/calendardatepicker/SimpleMonthView.java
+++ b/DroidRage/externalSrc/com/doomonafireball/betterpickers/calendardatepicker/SimpleMonthView.java
@@ -45,6 +45,7 @@
 import com.doomonafireball.betterpickers.TouchExplorationHelper;
 import com.doomonafireball.betterpickers.Utils;
 import com.doomonafireball.betterpickers.calendardatepicker.SimpleMonthAdapter.CalendarDay;
+import com.meetingninja.csse.R;
 
 /**
  * A calendar-like view displaying a specified month and the appropriate
diff --git a/DroidRage/externalSrc/com/doomonafireball/betterpickers/calendardatepicker/TextViewWithCircularIndicator.java b/DroidRage/externalSrc/com/doomonafireball/betterpickers/calendardatepicker/TextViewWithCircularIndicator.java
index 68b32b1a..abddee19 100644
--- a/DroidRage/externalSrc/com/doomonafireball/betterpickers/calendardatepicker/TextViewWithCircularIndicator.java
+++ b/DroidRage/externalSrc/com/doomonafireball/betterpickers/calendardatepicker/TextViewWithCircularIndicator.java
@@ -16,6 +16,8 @@
 
 package com.doomonafireball.betterpickers.calendardatepicker;
 
+import com.meetingninja.csse.R;
+
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Canvas;
diff --git a/DroidRage/externalSrc/com/doomonafireball/betterpickers/calendardatepicker/YearPickerView.java b/DroidRage/externalSrc/com/doomonafireball/betterpickers/calendardatepicker/YearPickerView.java
index b03cb0d0..3cfa7b08 100644
--- a/DroidRage/externalSrc/com/doomonafireball/betterpickers/calendardatepicker/YearPickerView.java
+++ b/DroidRage/externalSrc/com/doomonafireball/betterpickers/calendardatepicker/YearPickerView.java
@@ -32,6 +32,7 @@
 import android.widget.TextView;
 
 import com.doomonafireball.betterpickers.calendardatepicker.CalendarDatePickerDialog.OnDateChangedListener;
+import com.meetingninja.csse.R;
 
 /**
  * Displays a selectable list of years.
diff --git a/DroidRage/externalSrc/com/doomonafireball/betterpickers/hmspicker/HmsPicker.java b/DroidRage/externalSrc/com/doomonafireball/betterpickers/hmspicker/HmsPicker.java
index 394d4f95..fe63ef83 100644
--- a/DroidRage/externalSrc/com/doomonafireball/betterpickers/hmspicker/HmsPicker.java
+++ b/DroidRage/externalSrc/com/doomonafireball/betterpickers/hmspicker/HmsPicker.java
@@ -1,5 +1,7 @@
 package com.doomonafireball.betterpickers.hmspicker;
 
+import com.meetingninja.csse.R;
+
 import android.content.Context;
 import android.content.res.ColorStateList;
 import android.content.res.TypedArray;
diff --git a/DroidRage/externalSrc/com/doomonafireball/betterpickers/hmspicker/HmsPickerDialogFragment.java b/DroidRage/externalSrc/com/doomonafireball/betterpickers/hmspicker/HmsPickerDialogFragment.java
index 47c76e3a..c4161636 100644
--- a/DroidRage/externalSrc/com/doomonafireball/betterpickers/hmspicker/HmsPickerDialogFragment.java
+++ b/DroidRage/externalSrc/com/doomonafireball/betterpickers/hmspicker/HmsPickerDialogFragment.java
@@ -2,6 +2,8 @@
 
 import java.util.Vector;
 
+import com.meetingninja.csse.R;
+
 import android.app.Activity;
 import android.content.res.ColorStateList;
 import android.content.res.TypedArray;
diff --git a/DroidRage/externalSrc/com/doomonafireball/betterpickers/hmspicker/HmsView.java b/DroidRage/externalSrc/com/doomonafireball/betterpickers/hmspicker/HmsView.java
index d6fa7748..3b3bc97e 100644
--- a/DroidRage/externalSrc/com/doomonafireball/betterpickers/hmspicker/HmsView.java
+++ b/DroidRage/externalSrc/com/doomonafireball/betterpickers/hmspicker/HmsView.java
@@ -8,6 +8,7 @@
 import android.widget.LinearLayout;
 
 import com.doomonafireball.betterpickers.widget.ZeroTopPaddingTextView;
+import com.meetingninja.csse.R;
 
 public class HmsView extends LinearLayout {
 
diff --git a/DroidRage/externalSrc/com/doomonafireball/betterpickers/radialtimepicker/AmPmCirclesView.java b/DroidRage/externalSrc/com/doomonafireball/betterpickers/radialtimepicker/AmPmCirclesView.java
index 7d45da8f..3cb21457 100644
--- a/DroidRage/externalSrc/com/doomonafireball/betterpickers/radialtimepicker/AmPmCirclesView.java
+++ b/DroidRage/externalSrc/com/doomonafireball/betterpickers/radialtimepicker/AmPmCirclesView.java
@@ -18,6 +18,8 @@
 
 import java.text.DateFormatSymbols;
 
+import com.meetingninja.csse.R;
+
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Canvas;
diff --git a/DroidRage/externalSrc/com/doomonafireball/betterpickers/radialtimepicker/CircleView.java b/DroidRage/externalSrc/com/doomonafireball/betterpickers/radialtimepicker/CircleView.java
index d1d3e4e2..4b7d7d9b 100644
--- a/DroidRage/externalSrc/com/doomonafireball/betterpickers/radialtimepicker/CircleView.java
+++ b/DroidRage/externalSrc/com/doomonafireball/betterpickers/radialtimepicker/CircleView.java
@@ -16,6 +16,8 @@
 
 package com.doomonafireball.betterpickers.radialtimepicker;
 
+import com.meetingninja.csse.R;
+
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Canvas;
diff --git a/DroidRage/externalSrc/com/doomonafireball/betterpickers/radialtimepicker/RadialPickerLayout.java b/DroidRage/externalSrc/com/doomonafireball/betterpickers/radialtimepicker/RadialPickerLayout.java
index 6b28152d..4d3e2e93 100644
--- a/DroidRage/externalSrc/com/doomonafireball/betterpickers/radialtimepicker/RadialPickerLayout.java
+++ b/DroidRage/externalSrc/com/doomonafireball/betterpickers/radialtimepicker/RadialPickerLayout.java
@@ -38,6 +38,7 @@
 import android.view.accessibility.AccessibilityNodeInfo;
 import android.widget.FrameLayout;
 
+import com.meetingninja.csse.R;
 import com.nineoldandroids.animation.AnimatorSet;
 import com.nineoldandroids.animation.ObjectAnimator;
 import com.nineoldandroids.view.ViewHelper;
diff --git a/DroidRage/externalSrc/com/doomonafireball/betterpickers/radialtimepicker/RadialSelectorView.java b/DroidRage/externalSrc/com/doomonafireball/betterpickers/radialtimepicker/RadialSelectorView.java
index 8970fec5..7fcc5a93 100644
--- a/DroidRage/externalSrc/com/doomonafireball/betterpickers/radialtimepicker/RadialSelectorView.java
+++ b/DroidRage/externalSrc/com/doomonafireball/betterpickers/radialtimepicker/RadialSelectorView.java
@@ -23,6 +23,7 @@
 import android.util.Log;
 import android.view.View;
 
+import com.meetingninja.csse.R;
 import com.nineoldandroids.animation.Keyframe;
 import com.nineoldandroids.animation.ObjectAnimator;
 import com.nineoldandroids.animation.PropertyValuesHolder;
diff --git a/DroidRage/externalSrc/com/doomonafireball/betterpickers/radialtimepicker/RadialTextsView.java b/DroidRage/externalSrc/com/doomonafireball/betterpickers/radialtimepicker/RadialTextsView.java
index 582d003d..de107481 100644
--- a/DroidRage/externalSrc/com/doomonafireball/betterpickers/radialtimepicker/RadialTextsView.java
+++ b/DroidRage/externalSrc/com/doomonafireball/betterpickers/radialtimepicker/RadialTextsView.java
@@ -25,6 +25,7 @@
 import android.util.Log;
 import android.view.View;
 
+import com.meetingninja.csse.R;
 import com.nineoldandroids.animation.Keyframe;
 import com.nineoldandroids.animation.ObjectAnimator;
 import com.nineoldandroids.animation.PropertyValuesHolder;
diff --git a/DroidRage/externalSrc/com/doomonafireball/betterpickers/radialtimepicker/RadialTimePickerDialog.java b/DroidRage/externalSrc/com/doomonafireball/betterpickers/radialtimepicker/RadialTimePickerDialog.java
index 27964bff..3f087e3c 100644
--- a/DroidRage/externalSrc/com/doomonafireball/betterpickers/radialtimepicker/RadialTimePickerDialog.java
+++ b/DroidRage/externalSrc/com/doomonafireball/betterpickers/radialtimepicker/RadialTimePickerDialog.java
@@ -39,6 +39,7 @@
 
 import com.doomonafireball.betterpickers.Utils;
 import com.doomonafireball.betterpickers.radialtimepicker.RadialPickerLayout.OnValueSelectedListener;
+import com.meetingninja.csse.R;
 import com.nineoldandroids.animation.ObjectAnimator;
 
 /**
diff --git a/DroidRage/externalSrc/com/doomonafireball/betterpickers/timepicker/TimePicker.java b/DroidRage/externalSrc/com/doomonafireball/betterpickers/timepicker/TimePicker.java
index a69ab292..2c42a7b3 100644
--- a/DroidRage/externalSrc/com/doomonafireball/betterpickers/timepicker/TimePicker.java
+++ b/DroidRage/externalSrc/com/doomonafireball/betterpickers/timepicker/TimePicker.java
@@ -2,6 +2,8 @@
 
 import java.text.DateFormatSymbols;
 
+import com.meetingninja.csse.R;
+
 import android.content.Context;
 import android.content.res.ColorStateList;
 import android.content.res.Resources;
diff --git a/DroidRage/externalSrc/com/doomonafireball/betterpickers/timepicker/TimePickerDialogFragment.java b/DroidRage/externalSrc/com/doomonafireball/betterpickers/timepicker/TimePickerDialogFragment.java
index d7f6a08b..2fe9c9bd 100644
--- a/DroidRage/externalSrc/com/doomonafireball/betterpickers/timepicker/TimePickerDialogFragment.java
+++ b/DroidRage/externalSrc/com/doomonafireball/betterpickers/timepicker/TimePickerDialogFragment.java
@@ -2,6 +2,8 @@
 
 import java.util.Vector;
 
+import com.meetingninja.csse.R;
+
 import android.app.Activity;
 import android.content.res.ColorStateList;
 import android.content.res.TypedArray;
diff --git a/DroidRage/externalSrc/com/doomonafireball/betterpickers/timepicker/TimerView.java b/DroidRage/externalSrc/com/doomonafireball/betterpickers/timepicker/TimerView.java
index 89bfd639..f87a4d38 100644
--- a/DroidRage/externalSrc/com/doomonafireball/betterpickers/timepicker/TimerView.java
+++ b/DroidRage/externalSrc/com/doomonafireball/betterpickers/timepicker/TimerView.java
@@ -9,6 +9,7 @@
 import android.widget.LinearLayout;
 
 import com.doomonafireball.betterpickers.widget.ZeroTopPaddingTextView;
+import com.meetingninja.csse.R;
 
 public class TimerView extends LinearLayout {
 
diff --git a/DroidRage/externalSrc/com/doomonafireball/betterpickers/widget/UnderlinePageIndicatorPicker.java b/DroidRage/externalSrc/com/doomonafireball/betterpickers/widget/UnderlinePageIndicatorPicker.java
index c9d95ff6..aa88a72f 100644
--- a/DroidRage/externalSrc/com/doomonafireball/betterpickers/widget/UnderlinePageIndicatorPicker.java
+++ b/DroidRage/externalSrc/com/doomonafireball/betterpickers/widget/UnderlinePageIndicatorPicker.java
@@ -15,6 +15,8 @@
  */
 package com.doomonafireball.betterpickers.widget;
 
+import com.meetingninja.csse.R;
+
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Canvas;
diff --git a/DroidRage/externalSrc/com/doomonafireball/betterpickers/widget/ZeroTopPaddingTextView.java b/DroidRage/externalSrc/com/doomonafireball/betterpickers/widget/ZeroTopPaddingTextView.java
index c93c39b1..ac66555f 100644
--- a/DroidRage/externalSrc/com/doomonafireball/betterpickers/widget/ZeroTopPaddingTextView.java
+++ b/DroidRage/externalSrc/com/doomonafireball/betterpickers/widget/ZeroTopPaddingTextView.java
@@ -16,6 +16,8 @@
 
 package com.doomonafireball.betterpickers.widget;
 
+import com.meetingninja.csse.R;
+
 import android.content.Context;
 import android.graphics.Typeface;
 import android.os.Build;
diff --git a/DroidRage/externalSrc/pl/polidea/treeview/AbstractTreeViewAdapter.java b/DroidRage/externalSrc/pl/polidea/treeview/AbstractTreeViewAdapter.java
index 422bdc45..40a7c8f7 100644
--- a/DroidRage/externalSrc/pl/polidea/treeview/AbstractTreeViewAdapter.java
+++ b/DroidRage/externalSrc/pl/polidea/treeview/AbstractTreeViewAdapter.java
@@ -1,5 +1,7 @@
 package pl.polidea.treeview;
 
+import com.meetingninja.csse.R;
+
 import android.app.Activity;
 import android.content.Context;
 import android.database.DataSetObserver;
diff --git a/DroidRage/externalSrc/pl/polidea/treeview/TreeViewList.java b/DroidRage/externalSrc/pl/polidea/treeview/TreeViewList.java
index 872532ea..f3fb10a0 100644
--- a/DroidRage/externalSrc/pl/polidea/treeview/TreeViewList.java
+++ b/DroidRage/externalSrc/pl/polidea/treeview/TreeViewList.java
@@ -1,5 +1,7 @@
 package pl.polidea.treeview;
 
+import com.meetingninja.csse.R;
+
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
diff --git a/DroidRage/project.properties b/DroidRage/project.properties
index 4ab12569..cf521145 100644
--- a/DroidRage/project.properties
+++ b/DroidRage/project.properties
@@ -12,3 +12,4 @@
 
 # Project target.
 target=android-19
+android.library.reference.1=../../android-support-v7-appcompat
diff --git a/DroidRage/res/layout/activity_edit_group.xml b/DroidRage/res/layout/activity_edit_group.xml
index 1f0c58d9..a7428702 100644
--- a/DroidRage/res/layout/activity_edit_group.xml
+++ b/DroidRage/res/layout/activity_edit_group.xml
@@ -1,5 +1,6 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/group_edit_main_container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
@@ -17,6 +18,8 @@
         android:enabled="true"
         android:gravity="center"
         android:hint="@string/group_name"
+        android:inputType="text"
+        android:paddingBottom="@dimen/activity_vertical_margin"
         android:textSize="25sp" />
 
     <Button
@@ -24,6 +27,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:background="?android:attr/selectableItemBackground"
+        android:gravity="center_vertical"
         android:hint="+ Add a member"
         android:minHeight="28dp"
         android:onClick="addMember"
diff --git a/DroidRage/res/layout/activity_login.xml b/DroidRage/res/layout/activity_login.xml
index 2d269223..f2591a1b 100644
--- a/DroidRage/res/layout/activity_login.xml
+++ b/DroidRage/res/layout/activity_login.xml
@@ -95,15 +95,19 @@
 
                 <Button
                     android:id="@+id/sign_in_button"
+                    style="?android:attr/buttonStyleSmall"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_column="0"
                     android:layout_gravity="left"
                     android:layout_row="1"
+                    android:background="@android:drawable/btn_default_small"
                     android:text="@string/action_sign_in" />
 
                 <Button
                     android:id="@+id/register_button"
+                    style="?android:attr/buttonStyleSmall"
+					android:background="@android:drawable/btn_default_small"
                     android:layout_width="wrap_content"
                     android:layout_gravity="fill_horizontal"
                     android:layout_marginTop="@dimen/activity_horizontal_margin"
diff --git a/DroidRage/res/layout/activity_register.xml b/DroidRage/res/layout/activity_register.xml
index 52832a98..e0891397 100644
--- a/DroidRage/res/layout/activity_register.xml
+++ b/DroidRage/res/layout/activity_register.xml
@@ -67,6 +67,8 @@
 
         <Button
             android:id="@+id/register_action_button"
+            style="?android:attr/buttonStyleSmall"
+			android:background="@android:drawable/btn_default_small"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_alignParentBottom="true"
diff --git a/DroidRage/res/layout/activity_view_task.xml b/DroidRage/res/layout/activity_view_task.xml
index 35042bff..46e21544 100644
--- a/DroidRage/res/layout/activity_view_task.xml
+++ b/DroidRage/res/layout/activity_view_task.xml
@@ -189,13 +189,13 @@
 
                 <Button
                     android:id="@+id/task_complete_button"
-                    style="@style/TextAppearance.EditEvent_LabelSmall"
+                    style="?android:attr/buttonStyleSmall"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
                     android:layout_marginBottom="0dip"
                     android:layout_marginTop="0dip"
-                    android:background="?android:attr/selectableItemBackground"
+                    android:background="@android:drawable/btn_default_small"
                     android:contentDescription="@string/reminders_label"
                     android:gravity="top"
                     android:minHeight="20dip"
diff --git a/DroidRage/res/layout/edit_event_1.xml b/DroidRage/res/layout/edit_event_1.xml
index dc783403..7cfb91b4 100644
--- a/DroidRage/res/layout/edit_event_1.xml
+++ b/DroidRage/res/layout/edit_event_1.xml
@@ -208,6 +208,8 @@
 
         <Button
             android:id="@+id/add_agenda_button"
+            style="?android:attr/buttonStyleSmall"
+			android:background="@android:drawable/btn_default_small"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
diff --git a/DroidRage/res/layout/edit_event_2.xml b/DroidRage/res/layout/edit_event_2.xml
index 864c01a8..c64dc7e0 100644
--- a/DroidRage/res/layout/edit_event_2.xml
+++ b/DroidRage/res/layout/edit_event_2.xml
@@ -73,6 +73,8 @@
 
     <Button
         android:id="@+id/add_guests_btn"
+        style="?android:attr/buttonStyleSmall"
+		android:background="@android:drawable/btn_default_small"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/DroidRage/res/menu/edit_item_menu.xml b/DroidRage/res/menu/edit_item_menu.xml
index cab5a4e4..c283858f 100644
--- a/DroidRage/res/menu/edit_item_menu.xml
+++ b/DroidRage/res/menu/edit_item_menu.xml
@@ -1,7 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:id="@+id/edit_item_task" android:showAsAction="ifRoom" android:title="Edit" android:orderInCategory="100" android:icon="@drawable/ic_menu_edit"></item>
-    <item android:id="@+id/delete_item_task" android:orderInCategory="200" android:title="Delete" android:icon="@drawable/ic_menu_delete" android:showAsAction="ifRoom"></item>
-    
 
-</menu>
+    <item
+        android:id="@+id/edit_item_task"
+        android:icon="@drawable/ic_menu_edit"
+        android:orderInCategory="100"
+        android:showAsAction="ifRoom"
+        android:title="Edit">
+    </item>
+    <item
+        android:id="@+id/delete_item_task"
+        android:icon="@drawable/ic_menu_delete"
+        android:orderInCategory="200"
+        android:showAsAction="ifRoom"
+        android:title="Delete">
+    </item>
+
+</menu>
\ No newline at end of file
diff --git a/DroidRage/res/menu/editor_options_menu.xml b/DroidRage/res/menu/editor_options_menu.xml
index 80af46f6..fcc4fdd9 100644
--- a/DroidRage/res/menu/editor_options_menu.xml
+++ b/DroidRage/res/menu/editor_options_menu.xml
@@ -1,15 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@+id/menu_save"
-          android:icon="@drawable/ic_menu_save"
-          android:alphabeticShortcut='s'
-          android:title="@string/action_save"
-          android:showAsAction="ifRoom|withText" />
-    <item android:id="@+id/menu_revert"
-          android:icon="@drawable/ic_menu_revert"
-          android:title="@string/menu_revert" />
-    <item android:id="@+id/menu_delete"
-          android:icon="@drawable/ic_menu_delete"
-          android:title="@string/action_delete"
-          android:showAsAction="ifRoom|withText" />
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item
+        android:id="@+id/menu_save"
+        android:alphabeticShortcut="s"
+        android:icon="@drawable/ic_menu_save"
+        android:showAsAction="ifRoom|withText"
+        android:title="@string/action_save"/>
+    <item
+        android:id="@+id/menu_revert"
+        android:icon="@drawable/ic_menu_revert"
+        android:title="@string/menu_revert"/>
+    <item
+        android:id="@+id/menu_delete"
+        android:icon="@drawable/ic_menu_delete"
+        android:showAsAction="ifRoom|withText"
+        android:title="@string/action_delete"/>
+
 </menu>
\ No newline at end of file
diff --git a/DroidRage/res/menu/new_and_refresh_menu.xml b/DroidRage/res/menu/new_and_refresh_menu.xml
new file mode 100644
index 00000000..3b242d30
--- /dev/null
+++ b/DroidRage/res/menu/new_and_refresh_menu.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item
+        android:id="@+id/action_new"
+        android:icon="@drawable/ic_action_new"
+        android:orderInCategory="100"
+        android:showAsAction="ifRoom"
+        android:title="New Task">
+    </item>
+    <item
+        android:id="@+id/action_refresh"
+        android:icon="@drawable/ic_action_refresh"
+        android:orderInCategory="200"
+        android:showAsAction="ifRoom"
+        android:title="Refresh">
+    </item>
+
+</menu>
\ No newline at end of file
diff --git a/DroidRage/res/menu/new_meeting.xml b/DroidRage/res/menu/new_meeting.xml
index 475a9db2..a4515100 100644
--- a/DroidRage/res/menu/new_meeting.xml
+++ b/DroidRage/res/menu/new_meeting.xml
@@ -7,4 +7,5 @@
         android:showAsAction="ifRoom|withText"
         android:title="@+string/action_save">
     </item>
-</menu>
+
+</menu>
\ No newline at end of file
diff --git a/DroidRage/res/menu/notes_fragment.xml b/DroidRage/res/menu/notes_fragment.xml
index 5f7f2fd0..49f01dee 100644
--- a/DroidRage/res/menu/notes_fragment.xml
+++ b/DroidRage/res/menu/notes_fragment.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
-	 <item
+
+    <item
         android:id="@+id/action_new_note"
         android:icon="@drawable/ic_action_new"
         android:orderInCategory="100"
         android:showAsAction="ifRoom"
         android:title="@string/action_new_note"/>
-   <item
+    <item
         android:id="@id/action_refresh"
         android:icon="@drawable/ic_action_refresh"
         android:orderInCategory="200"
         android:showAsAction="ifRoom"
         android:title="@string/action_refresh"/>
-     
 
-</menu>
+</menu>
\ No newline at end of file
diff --git a/DroidRage/res/menu/swipe_list_test.xml b/DroidRage/res/menu/swipe_list_test.xml
index c84618e4..f8689de0 100644
--- a/DroidRage/res/menu/swipe_list_test.xml
+++ b/DroidRage/res/menu/swipe_list_test.xml
@@ -4,7 +4,7 @@
         android:id="@+id/action_settings"
         android:icon="@drawable/ic_action_settings"
         android:showAsAction="always"
-        android:title="@string/settings"/>
+        android:title="@string/action_settings"/>
     <item
         android:id="@+id/action_done"
         android:icon="@drawable/ic_action_done"
diff --git a/DroidRage/res/menu/task_fragment_menu.xml b/DroidRage/res/menu/task_fragment_menu.xml
deleted file mode 100644
index 62d4e0d4..00000000
--- a/DroidRage/res/menu/task_fragment_menu.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:id="@+id/action_new_task" android:orderInCategory="100" android:showAsAction="ifRoom" android:title="New Task" android:icon="@drawable/ic_action_new"></item>
-    <item android:id="@+id/action_refresh_task" android:orderInCategory="200" android:showAsAction="ifRoom" android:title="Refresh" android:icon="@drawable/ic_action_refresh"></item>
-    
-
-</menu>
diff --git a/DroidRage/res/menu/view_note.xml b/DroidRage/res/menu/view_note.xml
index 966467ae..74ad7361 100644
--- a/DroidRage/res/menu/view_note.xml
+++ b/DroidRage/res/menu/view_note.xml
@@ -2,9 +2,9 @@
 
     <item
         android:id="@+id/edit_note_action_edit"
+        android:icon="@drawable/ic_action_notes"
         android:orderInCategory="100"
-        android:title="@string/action_save"
         android:showAsAction="withText|ifRoom"
-        android:icon="@drawable/ic_menu_edit"/>
+        android:title="@string/action_edit"/>
 
-</menu>
+</menu>
\ No newline at end of file
diff --git a/DroidRage/res/values/arrays.xml b/DroidRage/res/values/arrays.xml
index 488d7200..fb05464d 100644
--- a/DroidRage/res/values/arrays.xml
+++ b/DroidRage/res/values/arrays.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
     <string-array name="availability">
         <item>Busy</item>
         <item>Available</item>
@@ -8,9 +9,12 @@
 
     <!-- This maps reminder_methods_labels to internal constants. -->
     <integer-array name="availability_values" translatable="false">
-        <item>0</item>  <!-- Busy -->
-        <item>1</item>  <!-- Available -->
-        <item>2</item>  <!-- Tentative -->
+        <item>0</item>
+ <!-- Busy -->
+        <item>1</item>
+ <!-- Available -->
+        <item>2</item>
+ <!-- Tentative -->
     </integer-array>
 
     <string-array name="visibility">
@@ -18,4 +22,5 @@
         <item>Private</item>
         <item>Public</item>
     </string-array>
-</resources>
+
+</resources>
\ No newline at end of file
diff --git a/DroidRage/res/values/attrs.xml b/DroidRage/res/values/attrs.xml
index 097fdb26..fd854900 100644
--- a/DroidRage/res/values/attrs.xml
+++ b/DroidRage/res/values/attrs.xml
@@ -1,56 +1,63 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
     <declare-styleable name="BetterPickersDialogFragment">
-        <attr name="bpTextColor" format="reference"/>
-        <attr name="bpTitleColor" format="reference"/>
-        <attr name="bpDeleteIcon" format="reference"/>
-        <attr name="bpCheckIcon" format="reference"/>
-        <attr name="bpKeyBackground" format="reference"/>
-        <attr name="bpButtonBackground" format="reference"/>
-        <attr name="bpTitleDividerColor" format="color"/>
-        <attr name="bpDividerColor" format="color"/>
-        <attr name="bpKeyboardIndicatorColor" format="color"/>
-        <attr name="bpDialogBackground" format="reference"/>
+        <attr name="bpTextColor" format="reference" />
+        <attr name="bpTitleColor" format="reference" />
+        <attr name="bpDeleteIcon" format="reference" />
+        <attr name="bpCheckIcon" format="reference" />
+        <attr name="bpKeyBackground" format="reference" />
+        <attr name="bpButtonBackground" format="reference" />
+        <attr name="bpTitleDividerColor" format="color" />
+        <attr name="bpDividerColor" format="color" />
+        <attr name="bpKeyboardIndicatorColor" format="color" />
+        <attr name="bpDialogBackground" format="reference" />
     </declare-styleable>
-    
+
     <!-- TreeView -->
     <declare-styleable name="TreeViewList">
-	    <attr name="collapsible" format="boolean" />
-		<attr name="src_expanded" format="reference|color" />
-		<attr name="src_collapsed" format="reference|color" />
+        <attr name="collapsible" format="boolean" />
+        <attr name="src_expanded" format="reference|color" />
+        <attr name="src_collapsed" format="reference|color" />
         <attr name="indent_width" format="dimension" />
         <attr name="handle_trackball_press" format="boolean" />
-		<attr name="indicator_gravity">
-			<!-- Push object to the top of its container, not changing its size. -->
-			<flag name="top" value="0x30" />
-			<!-- Push object to the bottom of its container, not changing its size. -->
-			<flag name="bottom" value="0x50" />
-			<!-- Push object to the left of its container, not changing its size. -->
-			<flag name="left" value="0x03" />
-			<!-- Push object to the right of its container, not changing its size. -->
-			<flag name="right" value="0x05" />
-			<!-- Place object in the vertical center of its container, not changing its size. -->
-			<flag name="center_vertical" value="0x10" />
-			<!-- Grow the vertical size of the object if needed so it completely fills its container. -->
-			<flag name="fill_vertical" value="0x70" />
-			<!-- Place object in the horizontal center of its container, not changing its size. -->
-			<flag name="center_horizontal" value="0x01" />
-			<!-- Grow the horizontal size of the object if needed so it completely fills its container. -->
-			<flag name="fill_horizontal" value="0x07" />
-			<!-- Place the object in the center of its container in both the vertical and horizontal axis, not changing its size. -->
-			<flag name="center" value="0x11" />
-			<!-- Grow the horizontal and vertical size of the object if needed so it completely fills its container. -->
-			<flag name="fill" value="0x77" />
-			<!-- Additional option that can be set to have the top and/or bottom edges of the child clipped to its container's bounds.
+        <attr name="indicator_gravity">
+
+            <!-- Push object to the top of its container, not changing its size. -->
+            <flag name="top" value="0x30" />
+            <!-- Push object to the bottom of its container, not changing its size. -->
+            <flag name="bottom" value="0x50" />
+            <!-- Push object to the left of its container, not changing its size. -->
+            <flag name="left" value="0x03" />
+            <!-- Push object to the right of its container, not changing its size. -->
+            <flag name="right" value="0x05" />
+            <!-- Place object in the vertical center of its container, not changing its size. -->
+            <flag name="center_vertical" value="0x10" />
+            <!-- Grow the vertical size of the object if needed so it completely fills its container. -->
+            <flag name="fill_vertical" value="0x70" />
+            <!-- Place object in the horizontal center of its container, not changing its size. -->
+            <flag name="center_horizontal" value="0x01" />
+            <!-- Grow the horizontal size of the object if needed so it completely fills its container. -->
+            <flag name="fill_horizontal" value="0x07" />
+            <!-- Place the object in the center of its container in both the vertical and horizontal axis, not changing its size. -->
+            <flag name="center" value="0x11" />
+            <!-- Grow the horizontal and vertical size of the object if needed so it completely fills its container. -->
+            <flag name="fill" value="0x77" />
+            <!--
+                 Additional option that can be set to have the top and/or bottom edges of the child clipped to its container's bounds.
 				The clip will be based on the vertical gravity: a top gravity will clip the bottom edge, a bottom gravity will clip the top
-				edge, and neither will clip both edges. -->
-			<flag name="clip_vertical" value="0x80" />
-			<!-- Additional option that can be set to have the left and/or right edges of the child clipped to its container's bounds.
+				edge, and neither will clip both edges.
+            -->
+            <flag name="clip_vertical" value="0x80" />
+            <!--
+                 Additional option that can be set to have the left and/or right edges of the child clipped to its container's bounds.
 				The clip will be based on the horizontal gravity: a left gravity will clip the right edge, a right gravity will clip the
-				left edge, and neither will clip both edges. -->
-			<flag name="clip_horizontal" value="0x08" />
-		</attr>
+				left edge, and neither will clip both edges.
+            -->
+            <flag name="clip_horizontal" value="0x08" />
+        </attr>
         <attr name="indicator_background" format="reference|color" />
         <attr name="row_background" format="reference|color" />
-	</declare-styleable>
+    </declare-styleable>
+
 </resources>
\ No newline at end of file
diff --git a/DroidRage/res/values/strings_notes.xml b/DroidRage/res/values/strings_notes.xml
index 35ea2900..ef03db8b 100644
--- a/DroidRage/res/values/strings_notes.xml
+++ b/DroidRage/res/values/strings_notes.xml
@@ -11,7 +11,7 @@
     <string name="button_ok">OK</string>
     <string name="text_title">Title:</string>
 
-    <string name="resolve_edit">Edit note</string>
+    <string name="action_edit">Edit</string>
     <string name="resolve_title">Edit title</string>
 
     <string name="error_title">Error</string>
diff --git a/DroidRage/res/values/strings_pref.xml b/DroidRage/res/values/strings_pref.xml
index 8092b5af..45f0f112 100644
--- a/DroidRage/res/values/strings_pref.xml
+++ b/DroidRage/res/values/strings_pref.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
     <string name="pref_sync_summ">Sync Summary</string>
     <string name="pref_sync">Sync Preferred</string>
     <string name="pref_syncConnectionTypes_default">Automatically</string>
     <string name="pref_syncConnectionType">Connection Type</string>
-    
-    
+
     <string-array name="pref_syncConnectionTypes_entries">
         <item>Automatically</item>
         <item>Hourly</item>
@@ -13,6 +13,5 @@
         <item>Every 3 Hours</item>
         <item>Manually</item>
     </string-array>
-    
-    
-</resources>
+
+</resources>
\ No newline at end of file
diff --git a/DroidRage/res/values/styles.xml b/DroidRage/res/values/styles.xml
index da0bbe62..fb83e3f4 100644
--- a/DroidRage/res/values/styles.xml
+++ b/DroidRage/res/values/styles.xml
@@ -246,8 +246,8 @@
     </style>
 
     <style name="fade_animation">
-        <item name="@android:windowEnterAnimation">@anim/popup_show</item>
-        <item name="@android:windowExitAnimation">@anim/popup_hide</item>
+        <item name="android:windowEnterAnimation">@anim/popup_show</item>
+        <item name="android:windowExitAnimation">@anim/popup_hide</item>
     </style>
 
 </resources>
\ No newline at end of file
diff --git a/DroidRage/src/com/meetingninja/csse/NavDrawerListAdapter.java b/DroidRage/src/com/meetingninja/csse/NavDrawerListAdapter.java
index 3e31cb1a..9cf27428 100644
--- a/DroidRage/src/com/meetingninja/csse/NavDrawerListAdapter.java
+++ b/DroidRage/src/com/meetingninja/csse/NavDrawerListAdapter.java
@@ -41,7 +41,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
 		if (v == null) {
 			LayoutInflater vi = (LayoutInflater) context
 					.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-			v = vi.inflate(R.layout.drawer_item, null);
+			v = vi.inflate(R.layout.list_drawer_item, null);
 
 		}
 		ImageView imgIcon = (ImageView) v.findViewById(R.id.icon);
diff --git a/DroidRage/src/com/meetingninja/csse/agenda/AgendaActivity.java b/DroidRage/src/com/meetingninja/csse/agenda/AgendaActivity.java
index f1aea394..9807d61d 100644
--- a/DroidRage/src/com/meetingninja/csse/agenda/AgendaActivity.java
+++ b/DroidRage/src/com/meetingninja/csse/agenda/AgendaActivity.java
@@ -39,6 +39,7 @@
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.meetingninja.csse.R;
 import com.meetingninja.csse.database.AgendaDatabaseAdapter;
 
 public class AgendaActivity extends FragmentActivity {
diff --git a/DroidRage/src/com/meetingninja/csse/agenda/AgendaItemAdapter.java b/DroidRage/src/com/meetingninja/csse/agenda/AgendaItemAdapter.java
index 5f560fa5..3d311260 100644
--- a/DroidRage/src/com/meetingninja/csse/agenda/AgendaItemAdapter.java
+++ b/DroidRage/src/com/meetingninja/csse/agenda/AgendaItemAdapter.java
@@ -19,6 +19,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import com.meetingninja.csse.R;
+
 import objects.Topic;
 import pl.polidea.treeview.AbstractTreeViewAdapter;
 import pl.polidea.treeview.TreeBuilder;
diff --git a/DroidRage/src/com/meetingninja/csse/database/local/SQLiteMeetingAdapter.java b/DroidRage/src/com/meetingninja/csse/database/local/SQLiteMeetingAdapter.java
index cea0ea54..6e17393f 100644
--- a/DroidRage/src/com/meetingninja/csse/database/local/SQLiteMeetingAdapter.java
+++ b/DroidRage/src/com/meetingninja/csse/database/local/SQLiteMeetingAdapter.java
@@ -68,18 +68,8 @@ public Meeting insertMeeting(Meeting m) {
 		ContentValues contentValues = new ContentValues();
 		contentValues.put(KEY_TITLE, m.getTitle());
 		contentValues.put(KEY_LOCATION, m.getLocation());
-		try {
-			contentValues.put(KEY_START_TIME, m.getStartTimeInMillis());
-		} catch (ParseException e) {
-			Log.e(TAG, e.getLocalizedMessage());
-			return null;
-		}
-		try {
-			contentValues.put(KEY_END_TIME, m.getEndTimeInMillis());
-		} catch (ParseException e) {
-			Log.e(TAG, e.getLocalizedMessage());
-			return null;
-		}
+		contentValues.put(KEY_START_TIME, m.getStartTime());
+		contentValues.put(KEY_END_TIME, m.getEndTime());
 		contentValues.put(KEY_DESCRIPTION, m.getDescription());
 
 		long insertID = mDb.insert(TABLE_NAME, null, contentValues);
@@ -142,18 +132,8 @@ public void updateMeeting(Meeting meeting) {
 		ContentValues data = new ContentValues();
 		data.put(KEY_TITLE, meeting.getTitle());
 		data.put(KEY_LOCATION, meeting.getLocation());
-		try {
-			data.put(KEY_START_TIME, meeting.getStartTimeInMillis());
-		} catch (ParseException e) {
-			Log.e(TAG, e.getLocalizedMessage());
-			return;
-		}
-		try {
-			data.put(KEY_END_TIME, meeting.getEndTimeInMillis());
-		} catch (ParseException e) {
-			Log.e(TAG, e.getLocalizedMessage());
-			return;
-		}
+		data.put(KEY_START_TIME, meeting.getStartTime());
+		data.put(KEY_END_TIME, meeting.getEndTime());
 		data.put(KEY_DESCRIPTION, meeting.getDescription());
 
 		mDb.update(TABLE_NAME, data, KEY_ID + "=" + meeting.getID(), null);
diff --git a/DroidRage/src/com/meetingninja/csse/extras/SwipeList_TestActivity.java b/DroidRage/src/com/meetingninja/csse/extras/SwipeList_TestActivity.java
index e652abbc..24811bc5 100644
--- a/DroidRage/src/com/meetingninja/csse/extras/SwipeList_TestActivity.java
+++ b/DroidRage/src/com/meetingninja/csse/extras/SwipeList_TestActivity.java
@@ -19,6 +19,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import com.meetingninja.csse.R;
+
 import android.annotation.SuppressLint;
 import android.app.AlertDialog;
 import android.app.Dialog;
diff --git a/DroidRage/src/com/meetingninja/csse/group/EditGroupActivity.java b/DroidRage/src/com/meetingninja/csse/group/EditGroupActivity.java
index e6023583..82eb0d7b 100644
--- a/DroidRage/src/com/meetingninja/csse/group/EditGroupActivity.java
+++ b/DroidRage/src/com/meetingninja/csse/group/EditGroupActivity.java
@@ -2,16 +2,33 @@
 
 import objects.Group;
 import objects.User;
+
+import com.meetingninja.csse.R;
+import com.meetingninja.csse.database.AsyncResponse;
+import com.meetingninja.csse.database.Keys;
+import com.meetingninja.csse.user.ProfileActivity;
+import com.meetingninja.csse.user.UserArrayAdapter;
+import com.meetingninja.csse.user.UserInfoFetcher;
+
+import android.os.Bundle;
+import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.View.OnClickListener;
+
+import android.view.View.OnTouchListener;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemClickListener;
 import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.ListAdapter;
@@ -43,32 +60,26 @@ protected void onCreate(Bundle savedInstanceState) {
 		titleText = (EditText) findViewById(R.id.group_edit_title);
 		titleText.setText(group.getGroupTitle());
 
+		// allows keyboard to hide when not editing text
+		findViewById(R.id.group_edit_main_container).setOnTouchListener(
+				new OnTouchListener() {
+					@Override
+					public boolean onTouch(View v, MotionEvent event) {
+						hideKeyboard();
+						return false;
+					}
+				});
+
 		mUserAdapter = new UserArrayAdapter(this, R.layout.line_item_user,
 				group.getMembers());
 		View v = findViewById(R.id.group_edit_user_list);
 		l = (ListView) v.findViewById(android.R.id.list);
 		l.setAdapter(mUserAdapter);
-		// l.setOnItemClickListener(new OnItemClickListener(){
-		// @Override
-		// public void onItemClick(AdapterView<?> arg0, View view, int position,
-		// long id) {
-		// // TODO Auto-generated method stub
-		// Toast.makeText(view.getContext(), "youve selected: " +
-		// mUserAdapter.getItem(position).getDisplayName(),
-		// Toast.LENGTH_LONG).show();
-		//
-		// }
-		// });
 
 	}
 
 	@Override
 	public void getSwipeItem(boolean isRight, int position) {
-		Toast.makeText(
-				this,
-				"Swipe to " + (isRight ? "right" : "left") + " direction on: "
-						+ mUserAdapter.getItem(position).getDisplayName(),
-				Toast.LENGTH_SHORT).show();
 		group.getMembers().remove(position);
 		mUserAdapter.notifyDataSetChanged();
 	}
@@ -80,6 +91,12 @@ public boolean onCreateOptionsMenu(Menu menu) {
 		return true;
 	}
 
+	private void hideKeyboard() {
+		InputMethodManager inputMethodManager = (InputMethodManager) getSystemService(Activity.INPUT_METHOD_SERVICE);
+		inputMethodManager.hideSoftInputFromWindow(getCurrentFocus()
+				.getWindowToken(), 0);
+	}
+
 	private final View.OnClickListener gActionBarListener = new OnClickListener() {
 
 		@Override
@@ -130,7 +147,7 @@ private boolean onActionBarItemSelected(View v) {
 	}
 
 	private void save() {
-		if (TextUtils.isEmpty(titleText.getText())) {
+		if (titleText.getText().toString().isEmpty()) {
 			Toast.makeText(this, "Cannot have an empty title",
 					Toast.LENGTH_LONG).show();
 			return;
@@ -177,12 +194,10 @@ public ListView getListView() {
 
 	@Override
 	public void onItemClickListener(ListAdapter adapter, int position) {
-		Toast.makeText(
-				this,
-				"youve selected: "
-						+ mUserAdapter.getItem(position).getDisplayName(),
-				Toast.LENGTH_LONG).show();
-
+		User clicked = mUserAdapter.getItem(position);
+		Intent profileIntent = new Intent(this, ProfileActivity.class);
+		profileIntent.putExtra(Keys.User.PARCEL, clicked);
+		startActivity(profileIntent);
 	}
 
 	final class RetUserObj implements AsyncResponse<User> {
diff --git a/DroidRage/src/com/meetingninja/csse/group/GroupsFragment.java b/DroidRage/src/com/meetingninja/csse/group/GroupsFragment.java
index 784bd635..16257e91 100644
--- a/DroidRage/src/com/meetingninja/csse/group/GroupsFragment.java
+++ b/DroidRage/src/com/meetingninja/csse/group/GroupsFragment.java
@@ -13,6 +13,7 @@
 import android.view.View;
 import android.view.ViewGroup;
 
+import com.meetingninja.csse.R;
 import com.meetingninja.csse.database.Keys;
 import com.meetingninja.csse.user.SessionManager;
 
@@ -35,16 +36,16 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
 
 	@Override
 	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-		inflater.inflate(R.menu.task_fragment_menu, menu);
+		inflater.inflate(R.menu.new_and_refresh_menu, menu);
 	}
 
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item) {
 		switch (item.getItemId()) {
-		case R.id.action_refresh_task:
-			// TODO: refresh groups db call
+		case R.id.action_refresh:
+			//TODO: refresh groups db call
 			return true;
-		case R.id.action_new_task:
+		case R.id.action_new:
 			Intent i = new Intent(getActivity(), EditGroupActivity.class);
 			Group g = new Group("1234", "Testing groups edit page");
 			User u1 = new User();
diff --git a/DroidRage/src/com/meetingninja/csse/meetings/EditMeetingActivity.java b/DroidRage/src/com/meetingninja/csse/meetings/EditMeetingActivity.java
index 0fe0d31b..58bad9e3 100644
--- a/DroidRage/src/com/meetingninja/csse/meetings/EditMeetingActivity.java
+++ b/DroidRage/src/com/meetingninja/csse/meetings/EditMeetingActivity.java
@@ -43,6 +43,7 @@
 import com.doomonafireball.betterpickers.radialtimepicker.RadialPickerLayout;
 import com.doomonafireball.betterpickers.radialtimepicker.RadialTimePickerDialog;
 import com.doomonafireball.betterpickers.radialtimepicker.RadialTimePickerDialog.OnTimeSetListener;
+import com.meetingninja.csse.R;
 import com.meetingninja.csse.agenda.AgendaActivity;
 import com.meetingninja.csse.database.AsyncResponse;
 import com.meetingninja.csse.database.MeetingDatabaseAdapter;
@@ -108,12 +109,8 @@ protected void onCreate(Bundle savedInstanceState) {
 		start = Calendar.getInstance();
 		end = Calendar.getInstance();
 		if (displayedMeeting != null) {
-			try {
-				start.setTimeInMillis(displayedMeeting.getStartTimeInMillis());
-				end.setTimeInMillis(displayedMeeting.getEndTimeInMillis());
-			} catch (ParseException e) {
-				Log.e(TAG, e.getLocalizedMessage());
-			}
+			start.setTimeInMillis(displayedMeeting.getStartTimeInMillis());
+			end.setTimeInMillis(displayedMeeting.getEndTimeInMillis());
 		} else {
 			start.add(Calendar.HOUR_OF_DAY, 1);
 			start.set(Calendar.MINUTE, 0);
diff --git a/DroidRage/src/com/meetingninja/csse/meetings/MeetingItemAdapter.java b/DroidRage/src/com/meetingninja/csse/meetings/MeetingItemAdapter.java
index 5e88b69a..975e50f9 100644
--- a/DroidRage/src/com/meetingninja/csse/meetings/MeetingItemAdapter.java
+++ b/DroidRage/src/com/meetingninja/csse/meetings/MeetingItemAdapter.java
@@ -31,6 +31,7 @@
 import android.widget.ArrayAdapter;
 import android.widget.TextView;
 
+import com.meetingninja.csse.R;
 import com.meetingninja.csse.extras.MyDateUtils;
 
 /**
@@ -87,13 +88,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
 		Meeting meeting = meetings.get(position);
 
 		viewHolder.title.setText(meeting.getTitle());
-		try {
-			viewHolder.timeSpan.setText(getTimeSpan(
-					meeting.getStartTimeInMillis(),
-					meeting.getEndTimeInMillis(), false));
-		} catch (ParseException e) {
-			Log.e("MeetingItemAdapter", e.getLocalizedMessage());
-		}
+		viewHolder.timeSpan.setText(getTimeSpan(meeting.getStartTimeInMillis(), meeting.getEndTimeInMillis(),false));
 		viewHolder.location.setText(meeting.getLocation());
 
 		return rowView;
diff --git a/DroidRage/src/com/meetingninja/csse/meetings/MeetingsFragment.java b/DroidRage/src/com/meetingninja/csse/meetings/MeetingsFragment.java
index 2ad007cc..e0af36b6 100644
--- a/DroidRage/src/com/meetingninja/csse/meetings/MeetingsFragment.java
+++ b/DroidRage/src/com/meetingninja/csse/meetings/MeetingsFragment.java
@@ -47,6 +47,7 @@
 import com.android.volley.toolbox.StringRequest;
 import com.meetingninja.csse.ApplicationController;
 import com.meetingninja.csse.MainActivity;
+import com.meetingninja.csse.R;
 import com.meetingninja.csse.database.AsyncResponse;
 import com.meetingninja.csse.database.MeetingDatabaseAdapter;
 import com.meetingninja.csse.database.local.SQLiteMeetingAdapter;
@@ -77,20 +78,20 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
 
 		session = SessionManager.getInstance();
 		mySQLiteAdapter = new SQLiteMeetingAdapter(getActivity());
-
+		System.out.println("1");
 		// setup listview
 		meetingList = (ListView) v.findViewById(R.id.meetingsList);
 		meetingAdpt = new MeetingItemAdapter(getActivity(),
 				R.layout.list_item_meeting, meetings);
 		meetingList.setAdapter(meetingAdpt);
-
+		System.out.println("2");
 		populateList();
 		// check for internet access before getting meetings from remote
 		// database
 		if (Connectivity.isConnected(getActivity()) && isAdded()) {
 			fetchMeetings();
 		}
-
+		System.out.println("3");
 		// pretty images are better than boring text
 		meetingImageButton = (ImageButton) v.findViewById(android.R.id.empty);
 		meetingList.setEmptyView(meetingImageButton);
@@ -100,7 +101,7 @@ public void onClick(View arg0) {
 				editMeeting(null);
 			}
 		});
-
+		System.out.println("4");
 		// make list long-pressable
 		registerForContextMenu(meetingList);
 
@@ -117,7 +118,7 @@ public void onItemClick(AdapterView<?> parentAdapter,
 
 					}
 				});
-
+		System.out.println("5");
 		// Item long-click event
 		// TODO: Add additional options and click-events to these options
 		meetingList
@@ -142,7 +143,7 @@ public void onCreateContextMenu(ContextMenu menu, View v,
 
 					}
 				});
-
+		System.out.println("6");
 		return v;
 	}
 
diff --git a/DroidRage/src/com/meetingninja/csse/meetings/ViewMeetingActivity.java b/DroidRage/src/com/meetingninja/csse/meetings/ViewMeetingActivity.java
index 8b10c185..f48e05d9 100644
--- a/DroidRage/src/com/meetingninja/csse/meetings/ViewMeetingActivity.java
+++ b/DroidRage/src/com/meetingninja/csse/meetings/ViewMeetingActivity.java
@@ -15,6 +15,8 @@
  ******************************************************************************/
 package com.meetingninja.csse.meetings;
 
+import com.meetingninja.csse.R;
+
 import android.app.Activity;
 import android.os.Bundle;
 import android.view.Menu;
@@ -31,6 +33,7 @@ protected void onCreate(Bundle savedInstanceState) {
 	public boolean onCreateOptionsMenu(Menu menu) {
 		// Inflate the menu; this adds items to the action bar if it is present.
 		getMenuInflater().inflate(R.menu.view_meeting, menu);
+		System.out.println("makes it here?");
 		return true;
 	}
 
diff --git a/DroidRage/src/com/meetingninja/csse/notes/CreateNoteActivity.java b/DroidRage/src/com/meetingninja/csse/notes/CreateNoteActivity.java
index 2c4d95d5..c50dd97d 100644
--- a/DroidRage/src/com/meetingninja/csse/notes/CreateNoteActivity.java
+++ b/DroidRage/src/com/meetingninja/csse/notes/CreateNoteActivity.java
@@ -23,6 +23,7 @@
 import android.view.View;
 import android.widget.EditText;
 
+import com.meetingninja.csse.R;
 import com.meetingninja.csse.database.local.SQLiteNoteAdapter;
 
 public class CreateNoteActivity extends Activity {
diff --git a/DroidRage/src/com/meetingninja/csse/notes/EditNoteActivity.java b/DroidRage/src/com/meetingninja/csse/notes/EditNoteActivity.java
index 748f7554..b80d6069 100644
--- a/DroidRage/src/com/meetingninja/csse/notes/EditNoteActivity.java
+++ b/DroidRage/src/com/meetingninja/csse/notes/EditNoteActivity.java
@@ -31,6 +31,7 @@
 import android.widget.LinearLayout;
 import android.widget.ScrollView;
 
+import com.meetingninja.csse.R;
 import com.meetingninja.csse.database.Keys;
 import com.meetingninja.csse.database.local.SQLiteNoteAdapter;
 import com.meetingninja.csse.extras.MyDateUtils;
diff --git a/DroidRage/src/com/meetingninja/csse/notes/NoteItemAdapter.java b/DroidRage/src/com/meetingninja/csse/notes/NoteItemAdapter.java
index d2840d34..7e6ed34e 100644
--- a/DroidRage/src/com/meetingninja/csse/notes/NoteItemAdapter.java
+++ b/DroidRage/src/com/meetingninja/csse/notes/NoteItemAdapter.java
@@ -17,6 +17,8 @@
 
 import java.util.List;
 
+import com.meetingninja.csse.R;
+
 import objects.Note;
 import android.content.Context;
 import android.view.LayoutInflater;
diff --git a/DroidRage/src/com/meetingninja/csse/notes/NotesFragment.java b/DroidRage/src/com/meetingninja/csse/notes/NotesFragment.java
index ef5e4041..efab8742 100644
--- a/DroidRage/src/com/meetingninja/csse/notes/NotesFragment.java
+++ b/DroidRage/src/com/meetingninja/csse/notes/NotesFragment.java
@@ -45,6 +45,7 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.meetingninja.csse.ApplicationController;
 import com.meetingninja.csse.MainActivity;
+import com.meetingninja.csse.R;
 import com.meetingninja.csse.database.AsyncResponse;
 import com.meetingninja.csse.database.JsonNodeRequest;
 import com.meetingninja.csse.database.Keys;
diff --git a/DroidRage/src/com/meetingninja/csse/notes/VersionControlActivity.java b/DroidRage/src/com/meetingninja/csse/notes/VersionControlActivity.java
index 3013ebaa..0dbe1780 100644
--- a/DroidRage/src/com/meetingninja/csse/notes/VersionControlActivity.java
+++ b/DroidRage/src/com/meetingninja/csse/notes/VersionControlActivity.java
@@ -30,6 +30,7 @@
 import android.widget.ListView;
 import android.widget.TextView;
 
+import com.meetingninja.csse.R;
 import com.meetingninja.csse.user.SessionManager;
 
 public class VersionControlActivity extends Activity {
diff --git a/DroidRage/src/com/meetingninja/csse/notes/ViewNoteActivity.java b/DroidRage/src/com/meetingninja/csse/notes/ViewNoteActivity.java
index 80f0f5d0..f436a86b 100644
--- a/DroidRage/src/com/meetingninja/csse/notes/ViewNoteActivity.java
+++ b/DroidRage/src/com/meetingninja/csse/notes/ViewNoteActivity.java
@@ -9,6 +9,7 @@
 import android.view.MenuItem;
 import android.widget.TextView;
 
+import com.meetingninja.csse.R;
 import com.meetingninja.csse.database.Keys;
 
 public class ViewNoteActivity extends Activity {
diff --git a/DroidRage/src/com/meetingninja/csse/schedule/ScheduleAdapter.java b/DroidRage/src/com/meetingninja/csse/schedule/ScheduleAdapter.java
index adebeff3..240efe9e 100644
--- a/DroidRage/src/com/meetingninja/csse/schedule/ScheduleAdapter.java
+++ b/DroidRage/src/com/meetingninja/csse/schedule/ScheduleAdapter.java
@@ -33,6 +33,7 @@
 import android.widget.TextView;
 
 import com.foound.widget.AmazingAdapter;
+import com.meetingninja.csse.R;
 import com.meetingninja.csse.extras.MyDateUtils;
 
 public class ScheduleAdapter extends AmazingAdapter {
@@ -88,11 +89,12 @@ protected void bindSectionHeader(View view, int position,
 			TextView lSectionTitle = (TextView) view
 					.findViewById(R.id.schedule_header);
 			String sectionTitle = getSections()[getSectionForPosition(position)];
-			DateTime dt = new DateTime();
-			dt = MyDateUtils.JODA_SERVER_DATE_FORMAT
-					.parseDateTime(sectionTitle);
+			//DateTime dt = new DateTime();
+			//dt = Long.parseLong(sectionTitle);
+			//dt = MyDateUtils.JODA_SERVER_DATE_FORMAT
+					//.parseDateTime(sectionTitle);
 			lSectionTitle.setText(MyDateUtils.JODA_MEETING_DATE_FORMAT
-					.print(dt));
+					.print(Long.parseLong(sectionTitle)));
 		} else {
 			view.findViewById(R.id.schedule_header).setVisibility(View.GONE);
 		}
diff --git a/DroidRage/src/com/meetingninja/csse/tasks/CreateTasksActivity.java b/DroidRage/src/com/meetingninja/csse/tasks/CreateTasksActivity.java
index 679d8bd9..4ea1d913 100644
--- a/DroidRage/src/com/meetingninja/csse/tasks/CreateTasksActivity.java
+++ b/DroidRage/src/com/meetingninja/csse/tasks/CreateTasksActivity.java
@@ -20,6 +20,7 @@
 import android.view.Menu;
 import android.widget.Toast;
 
+import com.meetingninja.csse.R;
 import com.meetingninja.csse.database.AsyncResponse;
 
 public class CreateTasksActivity extends FragmentActivity implements
diff --git a/DroidRage/src/com/meetingninja/csse/tasks/EditTaskActivity.java b/DroidRage/src/com/meetingninja/csse/tasks/EditTaskActivity.java
index 1486b16b..ac5e355d 100644
--- a/DroidRage/src/com/meetingninja/csse/tasks/EditTaskActivity.java
+++ b/DroidRage/src/com/meetingninja/csse/tasks/EditTaskActivity.java
@@ -38,6 +38,7 @@
 
 import com.doomonafireball.betterpickers.calendardatepicker.CalendarDatePickerDialog;
 import com.doomonafireball.betterpickers.calendardatepicker.CalendarDatePickerDialog.OnDateSetListener;
+import com.meetingninja.csse.R;
 import com.meetingninja.csse.database.AsyncResponse;
 import com.meetingninja.csse.extras.MyDateUtils;
 
@@ -73,7 +74,7 @@ protected void onCreate(Bundle savedInstanceState) {
 			mTitle.setSelection(0, mTitle.getText().toString().length());
 
 			cal = Calendar.getInstance();
-			cal.setTimeInMillis(Long.parseLong(displayTask.getEndTime()));
+			cal.setTimeInMillis(displayTask.getEndTimeInMillis());
 
 			// int month = deadline.getMonthOfYear();
 			// int year = deadline.getYear();
@@ -96,8 +97,7 @@ private void setTask() {
 		mTitle.setText(displayTask.getTitle());
 		completionCriteria.setText(displayTask.getCompletionCriteria());
 		mDescription.setText(displayTask.getDescription());
-		String format = dateFormat.print(Long.parseLong(displayTask
-				.getEndTime()));
+		String format = dateFormat.print(displayTask.getEndTimeInMillis());
 		mDeadlineBtn.setText(format);
 		// String format =
 		// dateFormat.print(Long.parseLong(displayTask.getDateAssigned()));
@@ -116,9 +116,9 @@ private void setTask() {
 	}
 
 	public void toggleCompleted(View v) {
-		TaskUpdater updater = new TaskUpdater();
+		// TaskUpdater updater = new TaskUpdater();
 		displayTask.setIsCompleted(!displayTask.getIsCompleted());
-		updater.updateTask(displayTask);
+		// updater.updateTask(displayTask);
 		setTask();
 	}
 
@@ -252,14 +252,15 @@ public void onClick(View v) {
 		public void onDateSet(CalendarDatePickerDialog dialog, int year,
 				int monthOfYear, int dayOfMonth) {
 			Calendar tempcal = Calendar.getInstance();
-			// TODO: maybe the better set?
+			// TODO: maybe the better Calendarset?
+
 			tempcal.set(Calendar.DAY_OF_MONTH, dayOfMonth);
 			tempcal.set(Calendar.MONTH, monthOfYear);
 			tempcal.set(Calendar.YEAR, year);
 			Calendar now = null;
 			now = Calendar.getInstance();
 			now.add(Calendar.DAY_OF_MONTH, -1);
-			if (!tempcal.before(now)) {
+			if (tempcal.after(now)) {
 				cal.set(Calendar.DAY_OF_MONTH, dayOfMonth);
 				cal.set(Calendar.MONTH, monthOfYear);
 				cal.set(Calendar.YEAR, year);
diff --git a/DroidRage/src/com/meetingninja/csse/tasks/TasksFragment.java b/DroidRage/src/com/meetingninja/csse/tasks/TasksFragment.java
index f5b12206..32918ada 100644
--- a/DroidRage/src/com/meetingninja/csse/tasks/TasksFragment.java
+++ b/DroidRage/src/com/meetingninja/csse/tasks/TasksFragment.java
@@ -36,6 +36,7 @@
 import android.widget.ExpandableListView.OnChildClickListener;
 import android.widget.TextView;
 
+import com.meetingninja.csse.R;
 import com.meetingninja.csse.database.AsyncResponse;
 import com.meetingninja.csse.user.SessionManager;
 
@@ -101,16 +102,16 @@ public boolean onChildClick(ExpandableListView parent, View v,
 
 	@Override
 	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-		inflater.inflate(R.menu.task_fragment_menu, menu);
+		inflater.inflate(R.menu.new_and_refresh_menu, menu);
 	}
 
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item) {
 		switch (item.getItemId()) {
-		case R.id.action_refresh_task:
+		case R.id.action_refresh:
 			refreshTasks();
 			return true;
-		case R.id.action_new_task:
+		case R.id.action_new:
 			// max put your stuff here
 			return true;
 		default:
diff --git a/DroidRage/src/com/meetingninja/csse/tasks/ViewTaskActivity.java b/DroidRage/src/com/meetingninja/csse/tasks/ViewTaskActivity.java
index 0733d85b..9a73fb5f 100644
--- a/DroidRage/src/com/meetingninja/csse/tasks/ViewTaskActivity.java
+++ b/DroidRage/src/com/meetingninja/csse/tasks/ViewTaskActivity.java
@@ -15,6 +15,8 @@
  ******************************************************************************/
 package com.meetingninja.csse.tasks;
 
+import org.joda.time.format.DateTimeFormatter;
+
 import objects.Task;
 import objects.User;
 import android.app.Activity;
@@ -26,7 +28,9 @@
 import android.widget.Button;
 import android.widget.TextView;
 
+import com.meetingninja.csse.R;
 import com.meetingninja.csse.database.AsyncResponse;
+import com.meetingninja.csse.extras.MyDateUtils;
 import com.meetingninja.csse.user.UserInfoFetcher;
 
 public class ViewTaskActivity extends Activity {
@@ -36,6 +40,8 @@ public class ViewTaskActivity extends Activity {
 	private Button taskCompleteButton;
 	RetUserObj fetcher = null;
 	private Task task = null;
+	private DateTimeFormatter dateFormat = MyDateUtils.JODA_MEETING_DATE_FORMAT;
+
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
@@ -52,6 +58,7 @@ protected void onCreate(Bundle savedInstanceState) {
 	public boolean onCreateOptionsMenu(Menu menu) {
 		// Inflate the menu; this adds items to the action bar if it is present.
 		getMenuInflater().inflate(R.menu.edit_item_menu, menu);
+		getActionBar().setDisplayHomeAsUpEnabled(true);
 		return true;
 	}
 
@@ -69,6 +76,9 @@ public boolean onOptionsItemSelected(MenuItem item) {
 			deleter.deleteTask(task.getID());
 			setResult(RESULT_OK);
 			finish();
+		case android.R.id.home:
+			finish();
+			return true;
 		default:
 			return super.onOptionsItemSelected(item);
 		}
@@ -115,9 +125,12 @@ private void setupViews() {
 
 	private void setTask() {
 		taskName.setText(task.getTitle());
-		dateCreated.setText(task.getDateCreated());
+		String format = dateFormat.print(Long.parseLong(task.getDateCreated()));
+		dateCreated.setText(format);
+		//TODO: change this to the real date assigned
 		dateAssigned.setText(task.getDateAssigned());
-		deadline.setText(task.getEndTime());
+		format = dateFormat.print(task.getEndTimeInMillis());
+		deadline.setText(format);
 		description.setText(task.getDescription());
 		completionCriteria.setText(task.getCompletionCriteria());
 		if (task.getIsCompleted()) {
diff --git a/DroidRage/src/com/meetingninja/csse/user/LoginActivity.java b/DroidRage/src/com/meetingninja/csse/user/LoginActivity.java
index 7637235d..ec9374c6 100644
--- a/DroidRage/src/com/meetingninja/csse/user/LoginActivity.java
+++ b/DroidRage/src/com/meetingninja/csse/user/LoginActivity.java
@@ -37,6 +37,7 @@
 import android.widget.Toast;
 
 import com.meetingninja.csse.MainActivity;
+import com.meetingninja.csse.R;
 import com.meetingninja.csse.database.UserDatabaseAdapter;
 import com.meetingninja.csse.extras.Utilities;
 
diff --git a/DroidRage/src/com/meetingninja/csse/user/ProfileActivity.java b/DroidRage/src/com/meetingninja/csse/user/ProfileActivity.java
index 65f75044..cd8f1753 100644
--- a/DroidRage/src/com/meetingninja/csse/user/ProfileActivity.java
+++ b/DroidRage/src/com/meetingninja/csse/user/ProfileActivity.java
@@ -25,6 +25,7 @@
 import android.view.MenuItem;
 import android.view.View;
 
+import com.meetingninja.csse.R;
 import com.meetingninja.csse.database.Keys;
 
 public class ProfileActivity extends FragmentActivity {
@@ -94,7 +95,8 @@ public boolean onOptionsItemSelected(MenuItem item) {
 			//
 			// http://developer.android.com/design/patterns/navigation.html#up-vs-back
 			//
-			NavUtils.navigateUpFromSameTask(this);
+//			NavUtils.navigateUpFromSameTask(this);
+			finish();
 			return true;
 		}
 		return super.onOptionsItemSelected(item);
diff --git a/DroidRage/src/com/meetingninja/csse/user/ProfileFragment.java b/DroidRage/src/com/meetingninja/csse/user/ProfileFragment.java
index 9c12b7c2..c71b0b17 100644
--- a/DroidRage/src/com/meetingninja/csse/user/ProfileFragment.java
+++ b/DroidRage/src/com/meetingninja/csse/user/ProfileFragment.java
@@ -38,6 +38,7 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.loopj.android.image.SmartImageView;
 import com.meetingninja.csse.ApplicationController;
+import com.meetingninja.csse.R;
 import com.meetingninja.csse.database.AsyncResponse;
 import com.meetingninja.csse.database.JsonNodeRequest;
 import com.meetingninja.csse.database.Keys;
diff --git a/DroidRage/src/com/meetingninja/csse/user/RegisterActivity.java b/DroidRage/src/com/meetingninja/csse/user/RegisterActivity.java
index d3a3b1f1..a06638cb 100644
--- a/DroidRage/src/com/meetingninja/csse/user/RegisterActivity.java
+++ b/DroidRage/src/com/meetingninja/csse/user/RegisterActivity.java
@@ -34,6 +34,7 @@
 import android.widget.EditText;
 import android.widget.Toast;
 
+import com.meetingninja.csse.R;
 import com.meetingninja.csse.database.AsyncResponse;
 import com.meetingninja.csse.database.UserDatabaseAdapter;
 
diff --git a/DroidRage/src/com/meetingninja/csse/user/UserArrayAdapter.java b/DroidRage/src/com/meetingninja/csse/user/UserArrayAdapter.java
index 00b97801..4e264494 100644
--- a/DroidRage/src/com/meetingninja/csse/user/UserArrayAdapter.java
+++ b/DroidRage/src/com/meetingninja/csse/user/UserArrayAdapter.java
@@ -26,6 +26,7 @@
 import android.widget.TextView;
 
 import com.loopj.android.image.SmartImageView;
+import com.meetingninja.csse.R;
 
 public class UserArrayAdapter extends ArrayAdapter<User> {
 	private final Context context;
diff --git a/DroidRage/src/com/meetingninja/csse/user/UserListFragment.java b/DroidRage/src/com/meetingninja/csse/user/UserListFragment.java
index 9842c09f..c8bd1b75 100644
--- a/DroidRage/src/com/meetingninja/csse/user/UserListFragment.java
+++ b/DroidRage/src/com/meetingninja/csse/user/UserListFragment.java
@@ -37,6 +37,7 @@
 import com.android.volley.VolleyLog;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.meetingninja.csse.ApplicationController;
+import com.meetingninja.csse.R;
 import com.meetingninja.csse.database.AsyncResponse;
 import com.meetingninja.csse.database.JsonNodeRequest;
 import com.meetingninja.csse.database.Keys;
diff --git a/DroidRage/src/objects/Event.java b/DroidRage/src/objects/Event.java
index aaf5a0d4..8121d0a4 100644
--- a/DroidRage/src/objects/Event.java
+++ b/DroidRage/src/objects/Event.java
@@ -40,8 +40,8 @@ public String getStartTime() {
 				: MyDateUtils.JODA_SERVER_DATE_FORMAT.print(new DateTime(0L));
 	}
 
-	public long getStartTimeInMillis() throws ParseException {
-		return MyDateUtils.JODA_SERVER_DATE_FORMAT.parseMillis(startTime);
+	public long getStartTimeInMillis() {
+		return Long.parseLong(startTime);
 	}
 
 	public void setStartTime(String datetimeStart) {
@@ -49,7 +49,7 @@ public void setStartTime(String datetimeStart) {
 	}
 
 	public void setStartTime(long msStartTime) {
-		this.startTime = MyDateUtils.JODA_SERVER_DATE_FORMAT.print(msStartTime);
+		this.startTime = Long.toString(msStartTime);
 	}
 
 	public String getEndTime() {
@@ -57,8 +57,8 @@ public String getEndTime() {
 				: MyDateUtils.JODA_SERVER_DATE_FORMAT.print(new DateTime(1L));
 	}
 
-	public long getEndTimeInMillis() throws ParseException {
-		return MyDateUtils.JODA_SERVER_DATE_FORMAT.parseMillis(endTime);
+	public long getEndTimeInMillis(){
+		return Long.parseLong(endTime);
 	}
 
 	public void setEndTime(String datetimeEnd) {
@@ -80,14 +80,9 @@ public void setDescription(String description) {
 
 	@Override
 	public int compareTo(Event another) {
-		if (another == null)
+		if (another == null){
 			return 1;
-		try {
-			return Long.valueOf(getStartTimeInMillis()).compareTo(
-					Long.valueOf(another.getStartTimeInMillis()));
-		} catch (ParseException e) {
-			Log.e("Meeting compareTo ", e.getLocalizedMessage());
 		}
-		return 1;
+		return Long.valueOf(getStartTime()).compareTo(Long.valueOf(another.getStartTime()));
 	}
 }