get_host
get_host
Merge branch 'master' of https://github.com/HowMuchi/HowMuchi

Conflicts:
	delete_act.php
	list.js
Merge branch 'master' of https://github.com/HowMuchi/HowMuchi
Merge branch 'master' of https://github.com/HowMuchi/HowMuchi
Merge branch 'master' of https://github.com/HowMuchi/HowMuchi

Conflicts:
	delete_act.php