fuck commit
fuck commit bis
v0.1.9-dev
en dev
Merge branch master of https://github.com/vekah/mvp into dev

Conflicts:
	js/init.js
	portail.html
	portail.html~
	template/player.html~
Merge branch 'dev' of https://github.com/vekah/mvp into dev

Conflicts:
	portail.html
ok
Merge branch 'master' into dev
patch v0.1.8-2

Conflicts:
	portail.html
Merge branch 'master' into dev

Conflicts:
	portail.html
Merge branch 'dev' of https://github.com/vekah/mvp into dev

Conflicts:
	template/player.html~
Merge branch 'master' into dev
dev
+ templates installing
templating
+ progress bar
+ tmpl init begin a stringifier
dev
+ kernel
+ opé
- view.js
+ mise en prod ?
+ rights