Update test data for new database design
Merge branch 'master' of github.com:helluvamatt/www-vbin

Conflicts:
	app/db/test_data.sql