Merge branch 'master' of github.com:DotYou/Socializr
redirect to ssl
Merge pull request #13 from Hikariii/Feature/Integration

redirect to ssl
Merge branch 'master' of github.com:DotYou/Socializr
email and performance update
Auth aangepast
cookie domain set
access denied
Merge pull request #14 from smekkie/master

Angular controllers added
Merge branch 'master' of github.com:DotYou/Socializr into Feature/Login

Conflicts:
	app/app.php
	web/.htaccess
Merge pull request #15 from smekkie/master

Styling
Merge branch 'master' of github.com:DotYou/Socializr into Feature/Login
login with redirect
Merge pull request #16 from Hikariii/Feature/Login

Feature/login en performance
Group edit form modified
Merge branch 'master' of https://github.com/DotYou/Socializr
Home page created