slider alpha
Merge branch 'master' of https://github.com/Grapheme/infinity

Conflicts:
	static/less/model.less
Merge branch 'master' of https://github.com/Grapheme/infinity