yup
Merge branch 'master' of https://github.com/ConductiveIO/mb

Conflicts:
	public/api/consume.php
	public/api/init.php
	public/api/kill.php