preConditions review
Merge branch 'master' of
https://github.com/viniciusmayer/tdc-2013-portoalegre

Conflicts:
	db/changelog/db.changelog-1.2.xml