bio.html updates
more bio updates
fix addurl core
Merge branch 'testing'
quick start doc update
Merge branch 'master' into diffbot-testing
Merge branch 'master' into diffbot-testing
hack about 35%ish done
more updates
Merge branch 'testing' into diffbot-matt

Conflicts:
	Collectiondb.cpp
	HttpRequest.h
	PageBasic.cpp
	coll.main.0/coll.conf
more awesome fixes
fix url filters profile logic.
Merge branch 'diffbot-matt' into diffbot-testing

Conflicts:
	html/admin.html
merge diffbot-testing
remove coll.main.0/coll.conf