Merge branch 'miscfix' into employment
working on employment system
worked
working on employment
working on employment
translations
translations
added timepicker js
fixed some minor bugs
resolved confllict with develop
fixed delete issue
one change in signup notification email
one change in signup notification email
doc changes