Load inicial
Merge branch 'master' into config-server

Conflicts:
	css/fluig_extension.css
	js/fluig_extension.js