Refactoring Pratilipi and Auth API.
Changes in APIs corresponding to GenericAPI.
Merge master into api

Conflicts:
	war/WEB-INF/web.xml