stable
Merge branch 'master' of https://github.com/millertime3/security

Conflicts:
	changePermissions