Fix merge conflict with some wrong code
Fix merge conflict with some wrong code

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