Some cleanup
Some commit
Better array splicing for path matching
Removed star for now, added params
Correcting client
Merge branch 'dev' into better-matching

Conflicts:
	.impact/modules/blog/client/_.js
	client/main/index.js
Merge branch 'dev' into dashboard

Conflicts:
	client/main/index.js