Merge remote-tracking branch 'origin/master'

Conflicts:
	app/config/config.php
Update config.php
.gitignore refresh.
Merge branch 'master' of github.com:ArturD1/serviceaccess

Conflicts:
	app/config/config.php