Stub
AB Testing FB
Merge branch 'develop' into feature/abfacebook

Conflicts:
	src/main/html/login.html
Merge branch 'feature/abfacebook' into develop