modified the impl based on interface
merge conflicts
Google Drive config
Registration and login flow
config files
Merge branch 'master' of https://github.com/gs-lab/hackathon-feb2013-core

Conflicts:
	src/com/greatbox/service/IGreatBoxservice.java
Merge branch 'master' of github.com:gs-lab/hackathon-feb2013-core
changed gitignore
changed gitignore
Merge branch 'master' of github.com:gs-lab/hackathon-feb2013-core

Conflicts:
	src/com/greatbox/providerServices/impl/GoogleDriveProviderImpl.java
Merge branch 'master' of github.com:gs-lab/hackathon-feb2013-core

Conflicts:
	src/com/greatbox/providerServices/impl/GoogleDriveProviderImpl.java
implemented service call to getResource API
Merge branch 'master' of github.com:gs-lab/hackathon-feb2013-core
resolved conflcts
adding
Merge branch 'master' of https://github.com/gs-lab/hackathon-feb2013-core

Conflicts:
	.gitignore
	WebContent/WEB-INF/config/greatBox-spring-service.xml
	src/com/greatbox/controller/GreatBoxController.java
	src/com/greatbox/dao/IUserDAO.java
	src/com/greatbox/dao/impl/UserDAOImpl.java
	src/com/greatbox/providerServices/IDriveProviderService.java
	src/com/greatbox/providerServices/impl/GoogleDriveProviderImpl.java
	src/com/greatbox/providerServices/impl/SkyDriveProviderImpl.java
	src/com/greatbox/service/IGreatBoxservice.java
	src/com/greatbox/service/impl/GreatBoxServiceImpl.java
	src/com/greatbox/util/ErrorConstants.java
	src/com/greatbox/util/QueryHelper.java
resolved conflicts