merge fix
Merge branch 'master' of github.com:colin-dumitru/icer

Conflicts:
	public/typescript/charts.js
	public/typescript/main.js
	public/typescript/playlists.js
	public/typescript/playlists.js.map
	public/typescript/search.js
fixed some annimation issues