Update text.txt
Update text.txt
Update text.txt
Update text.txt
update to release version: 1.5.0.28
Update pom.xml
update to release version: 1.5.0.29
fix conflicts
Merge tag 'release/2014-03-10_07-46-45' into develop

release/2014-03-10_07-46-45