Merge branch 'develop' into automationTest
authorpurigarcia <pgarcia@solidgear.es>
Fri, 5 Jun 2015 08:32:37 +0000 (10:32 +0200)
committerpurigarcia <pgarcia@solidgear.es>
Fri, 5 Jun 2015 08:32:37 +0000 (10:32 +0200)

Trivial merge