Merge branch 'dev'

This commit is contained in:
Eduard Tomàs 2017-08-10 10:37:48 +02:00
commit afc0a5e5b2