17.05.2013 - test prj #1
Merge remote-tracking branch 'origin/master'