Merge branch 'master' of E:\wamp\www\Team-Solidaster with conflicts.
Merge remote-tracking branch 'origin/master'
Question details added