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

Conflicts:
	ansible/tasks/solr/config_solr_server.yml
Different solr locations.
Merge branch 'master' of https://github.com/ucldc/appstrap
Merge branch 'master' of https://github.com/mredar/appstrap
Need log4j.properties to be in tomcat lib path
Merge branch 'master' of https://github.com/ucldc/appstrap
Merge branch 'master' of https://github.com/mredar/appstrap
Setup log4j...
add the task-- duhu
Make /documentation alias and directory
Merge branch 'master' of https://github.com/mredar/appstrap
Merge branch 'master' of https://github.com/ucldc/appstrap
uncommited registry changes
POODLE fix to httpd.conf