working user/demographic insert
Merge branch 'master' of https://github.com/wkfunk/kappa

Conflicts:
	private/db_backup/postgres_command.sql