Merge commit, minor changes
Merge branch 'master' of github.com:ANamelessBand/ArtversityMobile

Conflicts:
	scripts/media.js