refactored apostrophe method into User
all features except notifications working at per second speed
Merge branch 'feature/staticclock' into develop