Fixed upgrade path
Merge branch 'master' of github.com:cognovis/intranet-timesheet2