Merge branch 'master' into roles_update
Merge branch 'master' of https://github.com/Shvarts/Cashhoppers
add button back on email tool
add info
update
add bootstrap header with ui bugs
update export from excel
Merge branch 'master' of https://github.com/Shvarts/Cashhoppers
update home page
update menu
add option to prizes
update winners sustem
update
Merge branch 'master' of https://github.com/Shvarts/Cashhoppers
update
fix position menu home page
fix links on home page
fix links on home page
resolve conflict
resolve conflict