merge trunk
changed session handling
[IMP] Modified the way the sessions are handled to easily work with or without cookies