update
Merge branch 'master' of https://github.com/peterramsing/splittip

Conflicts:
	controller/controller.connect.php
	includes/connect.php