Initial commit
Merge branch 'master' of github.com:mcagigas/local_materials

Conflicts:
	edit.php
	index.php
	lang/en/local_materials.php