add basic auth
update gitignore
remove composer.lock
update gitignore
Merge branch 'master' into production

Conflicts:
	.gitignore