Merge branch 'develop' into automationTest
authorpurigarcia <pgarcia@solidgear.es>
Wed, 8 Apr 2015 07:49:32 +0000 (09:49 +0200)
committerpurigarcia <pgarcia@solidgear.es>
Wed, 8 Apr 2015 07:49:32 +0000 (09:49 +0200)

Trivial merge