Added macro IS_USER and IS_ADMIN
Blocking edit links unless logged in
Merge remote-tracking branch 'origin/master'
Expose IS_USER, IS_ADMIN in base