Merge pull request #3 from MarcosFino/master

Added site_info fields to customize entity_proposal template
Add South migration script, and some cleanup
Merge remote-tracking branch 'upstream/master'