Look mom, its all less now
Merge branch 'develop' of ssh://git.freepbx.org/freepbx/framework into develop

Conflicts:
	amp_conf/htdocs/admin/assets/less/freepbx/reset.less