Commit From my account at http://ashish@developers.iitb.ac.in/gitcode/git/~ashish/mam.git to github public profile
Merge branch 'master' of https://github.com/ashish3x3x/Media-Asset-Management-System