Added feature1
Added Feature2
Added addtional features to feature2
Merged feature2_additional into master
Added feature3
Fixed bug#1234
Really fixing bug#1234
Added Fix1
Added Fix2
Added fix1
Merged v1.0 fixes