KAZOO-2183
addition to KAZOO-2118
Merge branch 'addition-to-KAZOO-2118' of https://github.com/onnet/kazoo into onnet-addition-to-KAZOO-2118

Conflicts:
	core/whistle_apps-1.0.0/src/whapps_call_command.erl