redesigned act-event combo input forms

deleted old a-e c form
added input form for type1 and type2
added dbmodel
Merge remote-tracking branch 'origin/Aman'
Merge branch 'master' of https://github.com/AmanKubanychbek/DSS