Merge branch '3.7' into evolution
Allow working when session is already started
Ip configuration
Merge branch 'evolution' of github.com:impresspages/ImpressPages-CMS into evolution