Updated OrderMediaCard.  Dealing with Ordering bug.
Merge branch 'master' of github.com:scalio/liger-prototype

Conflicts:
	app/src/main/java/scal/io/liger/view/OrderMediaCardView.java