django 1.7
Merge branch 'master' of github.com:drmelectronic/palabrayespiritu