Resolved some conflicts

Resolved some conflicts with naming between java classes and mysql
Type date changed to time stamp
Merge pull request #3 from ctharindace/master

I've resolved some persistance conflicts.