auction fixes
tarik lagi
pull 13 may
Merge branch 'master' of https://github.com/awidarto/shoplite

Conflicts:
	.DS_Store
	public/.DS_Store
pull data 13 MAy2
shop index routing fix
pull refresh
Merge branch 'master' of https://github.com/awidarto/shoplite
test update
merge
Merge branch 'master' of https://github.com/awidarto/shoplite
add dynamic tables ini forms
Merge branch 'master' of https://github.com/awidarto/shoplite

Conflicts:
	public/.DS_Store
front end fix
push refresh
push refresh
pull
pull 2
time, date & datetimepicker and other styling on datatables
time, date & datetimepicker and other styling on datatables
test update
merge

Merge branch 'master' of https://github.com/awidarto/shoplite
time, date & datetimepicker and other styling on datatables