merge develop to master (adds slider)

merge develop to master (adds slider)