added registration for owners vs secondary users
Merge remote-tracking branch 'origin/master'

Conflicts:
	webpage/data.db