add modules
add modules
Merge remote-tracking branch 'origin/master'

Conflicts:
	modules/dashboard/views/error/error.php