Resolve merge conflict (mainly whitespace)
Resolve merge conflict (mainly whitespace)

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