“test”
Merge branch 'master' of https://github.com/PDSD-2014/stroe-preda