Fixed js errors and css issues from merge
Merge origin/master

Conflicts:
	familytree.sql