[Updated]
Merge branch 'develop'
Merge branch 'master' of https://github.com/okanck/tableJS

Conflicts:
	README.md