changing the url from screen 3
Merge branch 'master' of git://github.com/jeffersonneves/drone.git

Conflicts:
	drone/WebContent/Component.js
changes of marcio