todo
add before_filter
Merge branch 'adminka'
admin fixes