Create README.md
Update README.md
merge
[Command and lifecycle] Lifecycle simplified, activities linked together- URL functionality to revise.
[Index Command and URL management] Lifecycle extended adding URL functionality
[URL management] Index showing URL info, URL activity needs refinement
[URL Shortening] <UnStable> Shortened URLs are now the result of a Combined hash function using both long URL provided and user identifier in order to generate robust and unique shortened identifiers. Functionality verified thoroughly, testing class provided.
[First fully functional version] <Stable> Complete functionality and lifecycle implemented according to the given specifications. Logout, custom short URLs, fault-tolerancy. NOTE that short URLs redirection is not implemented yet.
Update README.md
Update README.md
Update README.md
Update README.md
[Url ID Generation] URL id generation is now given by the basic generationtype strategy, removing the sequence dependency.
[Url Redirection] URL redirection implemented within the new RedirectController, keeping track of visits, fault-tolerant (page badurl.jsp)
[Reset Password] Inner logic implemented, new methods in handler and DAOs handling password reset tickets and dates properly. jsp and design decisions based on defined use cases. To do tasks are referred on comments as TODO (email sending, parameter forwarding, redirecting).
[Reset Password] completed and working properly, Command refinement, e-mail notifications to user, handler and DAO fault tolerant. handling password reset tickets, dates and times properly.
[Refactoring] Minor changes on index, removing unnecessary prints.
Merge master into Design

Conflicts:
	src/java/cat/urv/deim/sob/RedirectController.java
	src/java/cat/urv/deim/sob/SOBController.java
	src/java/cat/urv/deim/sob/beans/FormHandler.java
	src/java/cat/urv/deim/sob/command/ConfUrlCommand.java
	src/java/cat/urv/deim/sob/command/IndexCommand.java
	src/java/cat/urv/deim/sob/command/NewUrlCommand.java
	src/java/cat/urv/deim/sob/command/RedirectCommand.java
	src/java/cat/urv/deim/sob/db/UserDAO.java
	src/java/cat/urv/deim/sob/exceptions/SOBError.java
	src/java/cat/urv/deim/sob/persistence/IUserHandler.java
	src/java/cat/urv/deim/sob/util/Config.java
	src/java/cat/urv/deim/sob/util/URLConverter.java
	web/badurl.jsp
	web/iforgot.jsp
	web/index.jsp
	web/login.jsp
	web/newurl.jsp
	web/urlconf.jsp