Rebaserification
Merge branch 'wercker' of github.com:zuzak/apercu into wercker

Conflicts:
	test/clientside.js