changed date to datetime
Merge branch 'new_features' of github.com:lewisren/FuelEd into new_features