fixes
Merge branch 'alpha' of github.personal:jvazquez/organization into alpha

Conflicts:
	organization/static/js/main.js