Merge branch 'master' of ssh://192.168.100.6/repo/record

Conflicts:
	asuzr/common.py
	asuzr/views.py

asuzr/common.py

@@ -16,15 +16,10 @@ class custom_date(date):
  def weekday_color(self):
     return self.day_colors[self.weekday()]
   
- @property
- def date_dd_mm_yy(self):
-    return self.strftime('%d/%m/%Y')
-
  @property
  def is_weekend(self):
     return self.weekday() >= 5
 
-
 def log_view_call(fn):
     '''
     Wrapper for views log