Updated sources 2013-06-22_07-02-33
Merge remote-tracking branch 'origin/master'