St-1234: some changes
st1234 - modified
st1234: added
st1234- deleted
Modified by dev1
Modified by dev2
st1234: conflict solved