index restructure
fixed assetmanager
test
less fix
Merge branch 'master' into maincss

Conflicts:
	lib/assetmanager/lib/index.js
	lib/less/default.less
	lib/less/settings.less
Merge branch 'master' of https://github.com/ditma1/japreview into maincss

Conflicts:
	lib/views/index.jade
Merge branch 'master' of https://github.com/ditma1/japreview into maincss

Conflicts:
	lib/views/index.jade
@import fix
Merge remote-tracking branch 'origin/master'