no message
Merge branch 'master' of github.com:DomenicoColandrea86/projectx into Development

* 'master' of github.com:DomenicoColandrea86/projectx:
  no message

Conflicts:
	projectx_core/modules/projectx/manifests/phantomjs.pp