Merge branch 'master' of E:\wamp\www\Team-Solidaster with conflicts.
Header fixed to show questions in forum