changes labels
changes labels
Merge remote-tracking branch 'origin/frosa'
permissions changed
plugin
plugin
Merge remote-tracking branch 'origin/frosa'
fix
Merge branch 'master' into fgodinho

Conflicts:
	controllers/project.py
Merge branch 'fgodinho' of https://github.com/fabricerosa/InControl into fgodinho