Added autoversioning

Added autoversioning to the site for css and js files
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	.htaccess