Merge remote-tracking branch 'Dorkette/master'

Conflicts:
	ASD/Project4/asdcouch/asdcouch/app/_attachments/index.html
	ASD/Project4/asdcouch/asdcouch/app/_attachments/main.js