mas ajax
Merge branch 'development' of github.com:sbianchi/wira into development

Conflicts:
	app/views/invitations/list_roles.html.erb