merge
merge
Merge branch 'master' of github.com:baardev/dds

Conflicts:
	.htaccess