optimized timestamp type and added unixtimestamp type to differ between ms and s format
Merge branch 'master' of https://github.com/mpneuried/mysql-factory

Conflicts:
	index.js
	package.json