voip ordering work
Merge branch 'master' of https://github.com/16twenty/axess-new

Conflicts:
	app/views/pages/confirm.blade.php