Partial DB Updates for refactor - Display Working
Fixed plugin manager test to bypass doctrine.  Created new mockplugin for testing
Refactor of rendering pages complete
Merge remote-tracking branch 'upstream/production'
prep for merge with upstream master
Partial DB Updates for refactor - Display Working
Fixed plugin manager test to bypass doctrine.  Created new mockplugin for testing
Refactor of rendering pages complete
Merge remote-tracking branch 'origin/master'

Conflicts:
	RcmLogin/Module.php
Merge branch 'test_fix'
Merge remote-tracking branch 'upstream/master'
Added Asset Manager configs to all plugins
Partial DB Updates for refactor - Display Working
Fixed plugin manager test to bypass doctrine.  Created new mockplugin for testing
Refactor of rendering pages complete
prep for merge with upstream master
Added Asset Manager configs to all plugins
Merge remote-tracking branch 'origin/master'

Conflicts:
	RcmLogin/src/RcmLogin/Controller/PluginController.php
Saving Changes for Upsteam merge
Deleted unkonwn file