Update 22:14-08.06.2013
Merge remote-tracking branch 'origin/master'