Include velocity as well
Merge branch 'master' into appcache

Conflicts:
	dynamic/index.jade