orator's
Merge branch 'master' of github.com:khcr/resj

Conflicts:
	app/models/permission.rb