combine to media page
Merge remote-tracking branch 'irma7/master'
Update 1st milestone complete
update settings - sails
update
login changes
Merge pull request #10 from bhushano7/master

combine to media page