update 12.11.2014
Merge remote branch 'origin/master'
Merge remote branch 'origin/master'