Merge branch 'develop' into automationTest
authorpurigarcia <pgarcia@solidgear.es>
Mon, 4 May 2015 07:10:45 +0000 (09:10 +0200)
committerpurigarcia <pgarcia@solidgear.es>
Mon, 4 May 2015 07:10:45 +0000 (09:10 +0200)

Trivial merge