Back end and controller done for weekly events
merging
Merge branch 'dev'
Merge branch 'master' of https://github.com/skk1/csd3