Editor: Identação
Merge branch 'master' of https://github.com/AndreCunha1/ETC_BETA

Conflicts:
	editor/index.php