Indicator Permisions, test, template tags
Fix template regression
Add Perms to Indicator Admin
Merge branch 'bugfix/keyType' into develop
Fix Permision relationship, update admin