Merge branch 'develop' into automationTest
authorpurigarcia <pgarcia@solidgear.es>
Wed, 25 Mar 2015 12:20:58 +0000 (13:20 +0100)
committerpurigarcia <pgarcia@solidgear.es>
Wed, 25 Mar 2015 12:20:58 +0000 (13:20 +0100)

Trivial merge