try Commit
commit try
with web service
Merge branch 'master' of https://github.com/Ankita-Malani/qpeka

Conflicts:
	QPEKA_UI/build/classes/com/qpeka/api/APIConstants.class
	QPEKA_UI/build/classes/com/qpeka/api/AuthHandler.class
	QPEKA_UI/build/classes/com/qpeka/api/AuthService.class
	QPEKA_UI/build/classes/com/qpeka/api/AuthServlet.class
	QPEKA_UI/build/classes/com/qpeka/api/ImageApi.class
	QPEKA_UI/build/classes/com/qpeka/book/converter/BookConverterUtils.class
	QPEKA_UI/build/classes/com/qpeka/db/book/store/BookViewLogHandler.class
	QPEKA_UI/build/classes/com/qpeka/db/book/store/MongoAccessor.class
	QPEKA_UI/build/classes/com/qpeka/db/book/store/TinyBookURLIdGenerator.class
	QPEKA_UI/build/classes/com/qpeka/db/book/store/UserBookViewLogHandler.class
	QPEKA_UI/build/classes/com/qpeka/db/book/store/UserCommentHandler.class
	QPEKA_UI/build/classes/com/qpeka/db/book/store/UserRatingHandler.class
	QPEKA_UI/build/classes/com/qpeka/db/book/store/WorksHandler.class
	QPEKA_UI/build/classes/com/qpeka/db/book/store/tuples/BookMark.class
	QPEKA_UI/build/classes/com/qpeka/db/book/store/tuples/BookPageViewLog.class
	QPEKA_UI/build/classes/com/qpeka/db/book/store/tuples/EmailIdentity.class
	QPEKA_UI/build/classes/com/qpeka/db/book/store/tuples/GmailIdentifier.class
	QPEKA_UI/build/classes/com/qpeka/db/book/store/tuples/UserBookViewLog.class
	QPEKA_UI/build/classes/com/qpeka/db/book/store/tuples/UserComments.class
	QPEKA_UI/build/classes/com/qpeka/db/book/store/tuples/UserRating.class
	QPEKA_UI/build/classes/com/qpeka/db/book/store/tuples/Work.class
	QPEKA_UI/build/classes/com/qpeka/epub/provider/EpubManager.class
	QPEKA_UI/build/classes/com/qpeka/epub/provider/servlet/ContentProviderServlet.class
	QPEKA_UI/build/classes/com/qpeka/managers/UserManager.class
	QPEKA_UI/build/classes/com/qpeka/managers/WorkContentManager.class
	QPEKA_UI/build/classes/com/qpeka/servlets/ImageServlet.class
	QPEKA_UI/build/classes/com/qpeka/servlets/UserAuthServlet.class
	QPEKA_UI/build/classes/com/qpeka/servlets/UserRegistrationServlet.class
	QPEKA_UI/build/classes/com/qpeka/servlets/ViewLogHandlerServlet.class
	QPEKA_UI/build/classes/com/qpeka/servlets/WorkInfoServlet.class
	QPEKA_UI/build/classes/com/qpeka/servlets/WorkUploadServlet.class
	QPEKA_UI/build/classes/com/qpeka/test/TestBooks.class
	QPEKA_UI/build/classes/com/qpeka/test/TestHttpHit.class
	QPEKA_UI/build/classes/com/qpeka/utils/BookTinyURLIDGenerator.class
	QPEKA_UI/build/classes/com/qpeka/utils/SystemConfigHandler.class
	QPEKA_UI/build/classes/com/qpeka/utils/SystemConstants.class
	QPEKA_UI/build/classes/com/qpeka/utils/Utils.class
	QPEKA_UI/build/classes/nl/siegmann/epublib/Constants.class
	QPEKA_UI/build/classes/nl/siegmann/epublib/browsersupport/NavigationEvent.class
	QPEKA_UI/build/classes/nl/siegmann/epublib/browsersupport/NavigationEventListener.class
	QPEKA_UI/build/classes/nl/siegmann/epublib/browsersupport/NavigationHistory$Location.class
	QPEKA_UI/build/classes/nl/siegmann/epublib/browsersupport/NavigationHistory.class
	QPEKA_UI/build/classes/nl/siegmann/epublib/browsersupport/Navigator.class
	QPEKA_UI/build/classes/nl/siegmann/epublib/browsersupport/package-info.class
	QPEKA_UI/build/classes/nl/siegmann/epublib/domain/Author.class
	QPEKA_UI/build/classes/nl/siegmann/epublib/domain/Book.class
	QPEKA_UI/build/classes/nl/siegmann/epublib/domain/Date$Event.class
	QPEKA_UI/build/classes/nl/siegmann/epublib/domain/Date.class
	QPEKA_UI/build/classes/nl/siegmann/epublib/domain/Guide.class
	QPEKA_UI/build/classes/nl/siegmann/epublib/domain/GuideReference.class
	QPEKA_UI/build/classes/nl/siegmann/epublib/domain/Identifier$Scheme.class
	QPEKA_UI/build/classes/nl/siegmann/epublib/domain/Identifier.class
	QPEKA_UI/build/classes/nl/siegmann/epublib/domain/ManifestItemProperties.class
	QPEKA_UI/build/classes/nl/siegmann/epublib/domain/ManifestItemRefProperties.class
	QPEKA_UI/build/classes/nl/siegmann/epublib/domain/ManifestProperties.class
	QPEKA_UI/build/classes/nl/siegmann/epublib/domain/MediaType.class
	QPEKA_UI/build/classes/nl/siegmann/epublib/domain/Metadata.class
	QPEKA_UI/build/classes/nl/siegmann/epublib/domain/Relator.class
	QPEKA_UI/build/classes/nl/siegmann/epublib/domain/Resource.class
	QPEKA_UI/build/classes/nl/siegmann/epublib/domain/ResourceReference.class
	QPEKA_UI/build/classes/nl/siegmann/epublib/domain/Resources.class
	QPEKA_UI/build/classes/nl/siegmann/epublib/domain/Spine.class
	QPEKA_UI/build/classes/nl/siegmann/epublib/domain/SpineReference.class
	QPEKA_UI/build/classes/nl/siegmann/epublib/domain/TOCReference$1.class
	QPEKA_UI/build/classes/nl/siegmann/epublib/domain/TOCReference.class
	QPEKA_UI/build/classes/nl/siegmann/epublib/domain/TableOfContents.class
	QPEKA_UI/build/classes/nl/siegmann/epublib/domain/TitledResourceReference.class
	QPEKA_UI/build/classes/nl/siegmann/epublib/epub/BookProcessor$1.class
	QPEKA_UI/build/classes/nl/siegmann/epublib/epub/BookProcessor.class
	QPEKA_UI/build/classes/nl/siegmann/epublib/epub/BookProcessorPipeline.class
	QPEKA_UI/build/classes/nl/siegmann/epublib/epub/DOMUtil.class
	QPEKA_UI/build/classes/nl/siegmann/epublib/epub/EpubProcessorSupport$EntityResolverImpl.class
	QPEKA_UI/build/classes/nl/siegmann/epublib/epub/EpubProcessorSupport.class
	QPEKA_UI/build/classes/nl/siegmann/epublib/epub/EpubReader.class
	QPEKA_UI/build/classes/nl/siegmann/epublib/epub/EpubWriter.class
	QPEKA_UI/build/classes/nl/siegmann/epublib/epub/HtmlProcessor.class
	QPEKA_UI/build/classes/nl/siegmann/epublib/epub/Main.class
	QPEKA_UI/build/classes/nl/siegmann/epublib/epub/NCXDocument$NCXAttributeValues.class
	QPEKA_UI/build/classes/nl/siegmann/epublib/epub/NCXDocument$NCXAttributes.class
	QPEKA_UI/build/classes/nl/siegmann/epublib/epub/NCXDocument$NCXTags.class
	QPEKA_UI/build/classes/nl/siegmann/epublib/epub/NCXDocument.class
	QPEKA_UI/build/classes/nl/siegmann/epublib/epub/PackageDocumentBase$DCAttributes.class
	QPEKA_UI/build/classes/nl/siegmann/epublib/epub/PackageDocumentBase$DCTags.class
	QPEKA_UI/build/classes/nl/siegmann/epublib/epub/PackageDocumentBase$OPFAttributes.class
	QPEKA_UI/build/classes/nl/siegmann/epublib/epub/PackageDocumentBase$OPFTags.class
	QPEKA_UI/build/classes/nl/siegmann/epublib/epub/PackageDocumentBase$OPFValues.class
	QPEKA_UI/build/classes/nl/siegmann/epublib/epub/PackageDocumentBase.class
	QPEKA_UI/build/classes/nl/siegmann/epublib/epub/PackageDocumentMetadataReader.class
	QPEKA_UI/build/classes/nl/siegmann/epublib/epub/PackageDocumentMetadataWriter.class
	QPEKA_UI/build/classes/nl/siegmann/epublib/epub/PackageDocumentReader.class
	QPEKA_UI/build/classes/nl/siegmann/epublib/epub/PackageDocumentWriter$1.class
	QPEKA_UI/build/classes/nl/siegmann/epublib/epub/PackageDocumentWriter.class
	QPEKA_UI/build/classes/nl/siegmann/epublib/service/MediatypeService.class
	QPEKA_UI/build/classes/nl/siegmann/epublib/util/CollectionUtil$IteratorEnumerationAdapter.class
	QPEKA_UI/build/classes/nl/siegmann/epublib/util/CollectionUtil.class
	QPEKA_UI/build/classes/nl/siegmann/epublib/util/DomUtil.class
	QPEKA_UI/build/classes/nl/siegmann/epublib/util/IOUtil.class
	QPEKA_UI/build/classes/nl/siegmann/epublib/util/NoCloseOutputStream.class
	QPEKA_UI/build/classes/nl/siegmann/epublib/util/NoCloseWriter.class
	QPEKA_UI/build/classes/nl/siegmann/epublib/util/ResourceUtil.class
	QPEKA_UI/build/classes/nl/siegmann/epublib/util/StringUtil.class
	QPEKA_UI/build/classes/nl/siegmann/epublib/util/commons/io/BOMInputStream.class
	QPEKA_UI/build/classes/nl/siegmann/epublib/util/commons/io/ByteOrderMark.class
	QPEKA_UI/build/classes/nl/siegmann/epublib/util/commons/io/ProxyInputStream.class
	QPEKA_UI/build/classes/nl/siegmann/epublib/util/commons/io/XmlStreamReader.class
	QPEKA_UI/build/classes/nl/siegmann/epublib/util/commons/io/XmlStreamReaderException.class
	QPEKA_UI/build/classes/nl/siegmann/epublib/utilities/StreamWriterDelegate.class
	QPEKA_UI/src/com/qpeka/managers/user/UserManager.java