Merge pull request #2 from drupalprojects/7.x-1.x

7.x 1.x
adding media browser to the stack
Merge pull request #3 from bradallenfisher/master

adding media browser to the stack
Merge remote-tracking branch 'origin/master' into 7.x-1.x