added more functionality  and ui to addOccurrencesController
Merge remote-tracking branch 'origin/master' into safety2