add method with map
removed conflict
change table users in admins
Merge branch 'master' of https://github.com/SavrukSergiy/dreamhost
Merge branch 'master' of https://github.com/SavrukSergiy/dreamhost
removed conflicts
Merge branch 'master' of https://github.com/SavrukSergiy/dreamhost
add icons and change some buttons style
removed conflicts
Merge branch 'master' of https://github.com/SavrukSergiy/dreamhost
add icons in userpage
Merge branch 'master' of https://github.com/SavrukSergiy/dreamhost