 Merge branch 'update-changelog' into 'master'
 Merge branch 'update-changelog' into 'master'

Update changelog

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