added tag editing functions
user update working but buggy
Merge branch 'dev' into staging