Merge branch 'develop' into automationTest
authorpurigarcia <pgarcia@solidgear.es>
Thu, 14 May 2015 08:18:12 +0000 (10:18 +0200)
committerpurigarcia <pgarcia@solidgear.es>
Thu, 14 May 2015 08:18:12 +0000 (10:18 +0200)

Trivial merge