implementation using pygame
Merge branch 'master' of https://github.com/neilforrest/mediapi

Conflicts:
	static/js/external/jquery-ui-1.11.2.custom/images/ui-icons_2e83ff_256x240.png
	static/js/external/jquery-ui-1.11.2.custom/images/ui-icons_cd0a0a_256x240.png