using current_user
Merge branch 'master' of github.com:sboily/xivo-unified-modules

Conflicts:
	amazon/conf/amazon.plugin
	deploy/conf/deploy.plugin
	ivr/conf/ivr.plugin
	ivr/static/js/jquery.jsPlumb-1.5.5.js
	openstack/conf/openstack.plugin
	ssh/conf/ssh.plugin
using current_user