Merge pull request #2 from comem/master

test
View
view
Merge branch 'master' into Clélia
Modif structure dossier
modif js
commentaire ligne 187 dans main.js
modif js
Mod de hier soir( pas just)
delete fause template
Merge branch 'master' into Naty

Conflicts:
	mmReadyHTMLCSS/index.html
Template
commitUseless
Merge branch 'Naty' of https://github.com/comem/mmready-test into Naty

Conflicts:
	JSEND/js/app/view/myExtendView.js
Dossier Views
Merge branch 'Naty' into Clélia
commit2000
Merge remote-tracking branch 'origin/Naty' into Clélia

Conflicts:
	MMReadyDesign/config.json
	MMReadyDesign/fonts/icomoon.eot
	MMReadyDesign/fonts/icomoon.svg
	MMReadyDesign/fonts/icomoon.ttf
	MMReadyDesign/html/eventAdd.html
	MMReadyDesign/html/listArtists.html
	MMReadyDesign/html/showEvent.html
	MMReadyDesign/js/bootstrap.js
	MMReadyDesign/js/bootstrap.min.js
	MMReadyDesign/less/bootstrap/bootstrap-theme.less
	MMReadyDesign/less/bootstrap/bootstrap-theme.min.less
	MMReadyDesign/less/bootstrap/bootstrap.less
	MVC/css/application.css
	MVC/css/bootstrap-theme.css
	MVC/css/bootstrap-theme.min.css
	MVC/css/bootstrap.css
	MVC/css/bootstrap.min.css
	MVC/fonts/icomoon.eot
	MVC/fonts/icomoon.svg
	MVC/fonts/icomoon.ttf
	MVC/fonts/icomoon.woff
	MVC/img/bg.png
	MVC/js/lib/backbone.js
	MVC/js/lib/bootstrap.js
	MVC/js/lib/bootstrap.min.js
	MVC/js/lib/jquery.js
	MVC/js/lib/underscore.js
	MVC/js/variables.js
	MVC/js/views/artistsList.html
	MVC/js/views/eventAdd.html
	MVC/less/advancedSearch.less
	MVC/less/application.less
	MVC/less/body.less
	MVC/less/bootstrap/bootstrap-theme.min.less
	MVC/less/bootstrap/bootstrap.less
	MVC/less/bootstrap/bootstrap.min.less
	MVC/less/buttonsGroup.less
	MVC/less/close.less
	MVC/less/eventResult.less
	MVC/less/fonts.less
	MVC/less/icomoon.less
	MVC/less/panelInformation.less
	MVC/less/searchBox.less
	MVC/less/showEvent.css
	MVC/less/showEvent.less
	MVC/less/variable.less
Synch
Merge branch 'Naty' into Clélia