#40 media list v2 and media upload style for ie and ff
Merge branch 'master' of https://github.com/IvenZ/awesome

Conflicts:
	app/views/Media/list.scala.html