Initial myelectric fork

Conflicts:
	Modules/node/node_view.php