Conflicts:
	Source/blocks/app/controllers/BaseController.php
	Source/blocks/app/elementtypes/EntryElementType.php
	Source/blocks/app/elementtypes/UserElementType.php
	Source/blocks/app/enums/UserStatus.php
	Source/blocks/app/helpers/DbHelper.php
	Source/blocks/app/resources/js/Assets/AssetFileManager.js
	Source/blocks/app/templates/_layouts/base.html
	Source/blocks/app/templates/content/entries/_edit.html