add some modules, added date time parsing
resolve merge conflict
Merge remote-tracking branch 'origin/master'

Conflicts:
	bartender.js
	twitterapi.js