Change of git repo name
Merge branch 'master' of https://github.com/mredar/appstrap

Conflicts:
	ansible/tasks/solr/config_solr_server.yml
Merge remote-tracking branch 'origin/master' into ingest