UI-673: Rearrange the inputs, pre populate them and add descriptions
Merge branch 'UI-673'
UI-685: Clean up popup charges generation
Merge branch 'master' of https://github.com/2600hz/kazoo-ui

Conflicts:
	config/lang/en.js