Changed from local_working branch
added in git ignored
Changed gitmodules
changed ignored
Merge branch 'local_working'

Conflicts:
	index.php
Corrected conflict