style
Merge branch 'VOIP-Changes' of github.com:16twenty/contact into VOIP-Changes

Conflicts:
	application/views/partial/slider.php