All changes completed except data model
Authored by: Alvaro del Castillo 2012-05-19
Parent(s): [3ef0d1]
Child(ren): [2d04ff]