Merge branches 'master' and 'dev'
Merge branches 'master' and 'dev'
Merge branches 'master' and 'dev'
Fixed the sliding issue in carousel and cleaned te code
made bootstrap modal, working fine, removed bootstrap lightbox
Merge branches 'dev' and 'master' into dev
some changes to main page