Fix merge conflict. Transparent ftw
Fix merge conflict. Transparent ftw

johnpuddephatt/symphony-2,DeuxHuitHuit/symphony-2,astudio/remixhair,mazedigital/jcilearn,blaXXabla/projet_test_symphony,wastemobile/Symphony2.3.6,avanteweb/symphony-2,jurajkapsz/symphony-2,thebestsophist/personal-health-diary,DeuxHuitHuit/symphony-2,ayellowraven/projectplaten,alexnantel88/symphony-2,jensscherbl/symphony,ljonka/symphony-2,jdsimcoe/symphony-boilerplate,NikoMostWanted/symphony-2,allen/auth.getsymphony.com,bauhouse/sym-todo-list,jensscherbl/symphony,NikoMostWanted/symphony-2,mazedigital/jcilearn,astudio/remixhair,bauhouse/sym-todo-list,bauhouse/Piano-Sonata,symphonycms/symphony-2,alexnantel88/symphony-2,roshinebagha/Symphony-Test,bauhouse/sym-pears,allen/auth.getsymphony.com,DavidForster/symphony-2,DavidForster/symphony-2,johnpuddephatt/symphony-2,bauhouse/sym-pears,ayellowraven/projectplaten,brendo/symphony-2,roshinebagha/Symphony-Test,rzantolas/Symphony-Test,blaXXabla/projet_test_symphony,ljonka/symphony-2,michael-e/symphony-2,jdsimcoe/symphony-boilerplate,symphonycms/sym-getsymphony,jdsimcoe/symphony-boilerplate,jonmifsud/symphony-2,symphonycms/sym-getsymphony,bauhouse/Piano-Sonata,rzantolas/Symphony-Test,symphonycms/symphony-2,wastemobile/Symphony2.3.6,twiro/symphony-2,BloodBrother/symphony-2,mazedigital/jcilearn,michael-e/symphony-2,brendo/symphony-2,twiro/symphony-2,BloodBrother/symphony-2,jonmifsud/symphony-2,avanteweb/symphony-2,thebestsophist/personal-health-diary,jdsimcoe/symphony-boilerplate,jurajkapsz/symphony-2