misc
Merge branch 'feature-standalone' of
https://github.com/ten24/Slatwall.git into feature-standalone-Paul

Conflicts:
	org/Hibachi/Hibachi.cfc
updated some rb keys
Re-Enabled Permissions
Working on new process logic.
Merge remote-tracking branch 'origin/feature-standalone-Paul' into feature-standalone
Minor bugfix.