Merge branch 'master' into update
from sublime
mixture.json update
Updated README & index.liquid

also changed _current reference to _demo
Index updated, added Manhattan icons
Merge branch 'update'