Solved merge conflict

Authored by franciscofernandes on Feb 25 2017, 2:43 PM.

Description

Solved merge conflict

Merged Changes

CommitAuthorDetailsCommitted
1559320b15e0araceletorres
fixing display menu dropwdown on firefox 
Feb 25 2017
9afc0d1af8f9araceletorres
style adjustments in menu dropdown 
Feb 25 2017

Empty Commit

This commit is empty and does not affect any paths.