Merge branch 'web/drptv/53'
GEM:85 here it is, 11.10.2014
Merge branch 'web/drptv/85' into dev