release version 1.5
Merge branch 'master' of github.com:Saerdna/AudioToArtImage

Conflicts:
	server.py
	static/css/custom.css
	static/font/fontawesome-webfont.eot
	static/font/fontawesome-webfont.ttf
	static/font/fontawesome-webfont.woff
	static/img/delete.gif
	static/weavesilk.html