user_series entity added
security context refactoring
set watched method
merge conflicts