master update from 'release-0.5'

This commit is contained in:
MassimilianoPinto
2014-03-28 16:21:10 +01:00
25 changed files with 420 additions and 39 deletions