Merge branch 'origin/Temporal-DB'
Merge branch 'origin/master'
Merge branch 'origin/master'
Merge branch 'origin/master'
indexes added to the tables
Merge branch 'temporal-db-patch' of https://github.com/mhotan/DD2471 into temporal-db-patch
A query on BikeRepository
Create StationCustomRepository with a custom query

see http://stackoverflow.com/a/17773184
Script to copy Neo4j database to standalone server
Added Transactions and Station DAO

Added Station Data Access object into Application Beans
Updated Services to be transactional.
Added Trip duration time into trip data.
added duration to table TRIP
find distance btw stations method is added
Merge remote-tracking branch 'origin/restful-web-service' into restful-web-service

Conflicts:
	server/src/main/java/se/kth/csc/moderndb/cbexplorer/core/repository/BikeRepository.java
Fixed Longitude Latitude bug and Made sure GraphService returns every object as a Core Object.
Merge branch 'restful-web-service' of https://github.com/mhotan/DD2471 into restful-web-service
Merge pull request #10 from mhotan/restful-web-service

Initial Configuration of Restful web service
Merge branch 'master' of https://github.com/mhotan/DD2471 into temporal-db-patch

Conflicts:
	core/src/main/java/se/kth/csc/moderndb/cbexplorer/parser/CitiBikeParser.java
Fixed redundant data from TripData
Corrections and taking file in java code