Formating
Add settings for apache deployment
Merge branch 'master' of github.com:tiagopais/swsantiago