Tested set_permission()
Merge branch 'master' of https://github.com/brndnthai/plantivity

Conflicts:
	plantivity/apps/plantivity_core/views.py
Merge branch 'master' of https://github.com/brndnthai/plantivity