hw tag rc4
Merge remote-tracking branch 'origin/dev'
Merge pull request #13 from fourbroad/master

hw rc4
remove knockout.js from public/javascript/index.js
Merge branch 'dev'
Merge remote-tracking branch 'origin/master' into dev

Conflicts:
	agilenotes/dump/000000000000000000000000/documents.bson