Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
removed the NOW from mysql and replaced it by a date from the server itself (the date in mysql caused timezone problems)
Merge branch 'mantis-163'
adjusted the cron jobs to work with the reconfigured configuration
removed an unnecessary file
Merge branch 'mantis-165' into dev