F1 Complete

Feature list 1 complete
V1.2 merge
F2 Complete

Done Feature list 2
Merged V1.2
Merged F2