 Merge branch 'show_diff' into 'master'
 Merge branch 'show_diff' into 'master'

Show note diff if diff exists

8thcolor/eurucamp2014-htdsadr,8thcolor/rubyconfau2015-sadr,8thcolor/rubyconfau2015-sadr,8thcolor/eurucamp2014-htdsadr,8thcolor/rubyconfau2015-sadr,8thcolor/eurucamp2014-htdsadr