log4j dependency added
resources and log4j properties added
Controller and ActionFactory debug logging
show error page added
show main page renamed
resolving merge conflict