+Pushstate
Merge branch 'master' of github.com:plasticut/new-ui

Conflicts:
	lib/app/index.js
some docs