Removed .gitmodules
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
Removed .gitmodulesAdded htdocs/ to .gitignore