Some More Changes done in Template to fix it for Codeigniter..
But Still Work Remaining.
Merge remote-tracking branch 'origin/master'