Merge branch 'develop' into release-1.0beta

This commit is contained in:
MassimilianoPinto
2014-07-04 14:11:45 +02:00