beta1
Merge branch 'master' of https://github.com/dniskav/velocityp

Conflicts:
	index.html