Changed url patterns and tests
.
Merge remote-tracking branch 'origin/iter2' into iter2

Conflicts:
	db.sqlite3