Adds a NO_CACHE cookie when a user logs in
Merge pull request #340 from terwey/CS-4696

Adds a NO_CACHE cookie when a user logs in
Check if Subscription is_active by default.
Merge pull request #341 from ahilles107/v4.2

Check if Subscription is_active by default.
Merge pull request #339 from danielhjames/v4.2

Removed bogus merge lines from localization file
Remove mysql_real_escape_string - it works now with Doctrine, and it's done by default.
Merge pull request #343 from ahilles107/v4.2

Remove mysql_real_escape_string