solved 2013/P2
Merge remote-tracking branch 'origin/master'