a
Merge branch 'master' of https://github.com/vekah/mvp
Merge branch 'master' of https://github.com/vekah/mvp
Merge branch 'master' of https://github.com/vekah/mvp
Merge branch 'master' of https://github.com/vekah/mvp
Merge branch 'master' of https://github.com/vekah/mvp
Merge branch 'master' of https://github.com/vekah/mvp
Merge branch 'master' of https://github.com/vekah/mvp
+ hotfix change IP
Merge branch 'master' of https://github.com/vekah/mvp
+ remote admin
+ htaccess
with rights
Merge branch 'master' of https://github.com/vekah/mvp
rights + https +prod
+ rm --cached .htaccess
+ debg config
change msg
+ params SSL
Merge branch 'dev' of https://github.com/vekah/mvp into dev

Conflicts:
	portail.html