v.17.12.2014
Merge remote-tracking branch 'origin/master'

Conflicts: