RedirectServlet code ordering
Add debug and error logs
Move resolver code to seperate method
Some changes as we talked:
-Only one affiliate company class
- Implement the redirect resolvers
- add some logs
- fix time format in logs
- Fixes after testing HufshatLeida links (null exception when more then
one "@u=" parameters)
Merge branch 'master' of https://github.com/liorsh25/ourproject.git

Conflicts:
	ourProject/build/classes/dao/AffiliatorsProvider.class
	ourProject/build/classes/dao/ShopsProvider.class
	ourProject/build/classes/dao/SubscribersProvider.class
	ourProject/build/classes/helpers/RestLikeUrlAnalyzer.class
	ourProject/build/classes/logic/NoShopMatchResolver.class
	ourProject/build/classes/logic/TemplatePlaceHolderResolver.class
	ourProject/build/classes/servlets/RedirectServlet.class