c
Merge branch 'master' of https://github.com/philgin/iTabulator

Conflicts:
	Philgin Tabulator/assets/scripts/custom.js