Merge Feature_Search
Merge branch 'Task_Cleanup' into aws_production
Merge branch 'Feature_UserStatistics' into aws_production

Conflicts:
	src/ListsIO/Bundle/ListBundle/Controller/ListsController.php
	src/ListsIO/Bundle/ListBundle/Entity/LIOList.php
	src/ListsIO/Bundle/UserBundle/Entity/User.php
	web/assets/css/bootstrap.css
	web/assets/js/app.js
Merge branch 'HotFix_KillStaticFeatured' into aws_production
Feed
Merge branch 'Fix_Serialization' into aws_production

Conflicts:
	app/AppKernel.php
	src/ListsIO/Bundle/ListBundle/Entity/LIOList.php
Changed username to nullable.
Made username canonical nullable.
Merge branch 'HotFix_FB500' into aws_production

Conflicts:
	web/assets/js/app.js
Reinstated not null on username and username canonical
Merge branch 'HotFix_FB500' into aws_production
Merge branch 'HotFix_Login' into aws_production
Merge branch 'HotFix_Login' into aws_production
Merge branch 'HotFix_Login' into aws_production
Merge branch 'HotFix_Login' into aws_production
Merge branch 'HotFix_Login' into aws_production
Merge branch 'HotFix_Login' into aws_production
Merge branch 'HotFix_Login' into aws_production
Merge branch 'HotFix_Login' into aws_production
Merge branch 'Feature_EmailOnTwitterReg' into aws_production