changes for local addresses and

i change addresses and add files to local folders
Merge remote-tracking branch 'origin/master'

Conflicts:
	plugins/system/msg/tpl/404.html