fixed user_filter reset problem
added font-awesome
Merge branch 'develop' into feature/reports