Reconsolidated unit and func tests into one file as required by Django
Merge branch 'master' of https://github.com/brndnthai/plantivity