merged with develop
forgot an str in timeclock.py
git does some confusing things sometimes - had to fix the limits again