Merge branch 'hotfix/0.18.0.2'
Merge remote-tracking branch 'origin/hotfix/0.18.0.3'
Use new status icon names (with old icons)

Defining the basic css for status icons here so that themes can just set
colours and add their own icons.
Now that alavetelitheme has a responsive stylesheet, make this the default.
Rename example databases to match documentation

Renamed with alaveteli_ prefix rather than foi_ in 3cd30c9 so keep the
example consistent.
Add template to example database config

Recommended setup includes creating a template (d0a8e9b) so specify that in the
database configuration example too.
Merge branch 'update-database-config-example' into rails-3-develop
Add a package list for Debian wheezy
Copy Brazilian Portugese to Portugal Portugese
Ignore deploy.yml files
Don't display locale options when there's only one.

Fixes bug introduced in 039fb5cc0f2965346ef23a4ba1b9d20f6cf73805
Merge branch 'rails-3-develop' of ssh://git.mysociety.org/data/git/public/alaveteli into rails-3-develop
Latest translations from Transifex.
Change wording of public holidays in crontab

Bank holiday is quite a UK-centric term, so replace with public holiday
for easier understanding among international reusers
Add upgrade notes for anti-spam honeypot
Merge branch 'hotfix/0.18.0.7' into rails-3-develop
Update install-site url to point at current location
Merge branch 'cron-holidays' into rails-3-develop
Upgrade Rails version
Merge branch 'rails-3-develop' of ssh://git.mysociety.org/data/git/public/alaveteli into rails-3-develop