Updated sources 2013-03-31_17-54-21
Merge remote-tracking branch 'origin/master'