changes commited...
last commit...
Merge branch 'testing' into test1
Pushed upto media-gallery (Still player needed)
Merge remote-tracking branch 'origin/master' into testing
upto media-gallery (still player needed)