Merge pull request #9 from bhushano7/master

Update media
settings page
Merge remote-tracking branch 'irma7/master'
Update 1st milestone complete