Tham's edited files
Merge remote-tracking branch 'origin/master'

Conflicts:
	INC-navbar.html
	sent-invite.php
	split-transaction.php
	transaction-list-out.php