voip, addons
Merge branch 'home-page-additions-'
Merge branch 'master' of https://github.com/16twenty/axess-new

Conflicts:
	app/views/pages/index.blade.php
	app/views/stubs/addonbox.blade.php
	app/views/stubs/planbox.blade.php